Commit 70208383 authored by Gerrit Renker's avatar Gerrit Renker
Browse files

dccp: Cleanup routines for feature negotiation 



This inserts the required de-allocation routines for memory allocated by 
feature negotiation in the socket destructors, replacing dccp_feat_clean()
in one instance.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
parent 828755ce

net/dccp/dccp.h

+2 −0
Original line number Diff line number Diff line
@@ -442,6 +442,8 @@ static inline int dccp_ack_pending(const struct sock *sk) 
	       inet_csk_ack_scheduled(sk);

}



extern void dccp_feat_list_purge(struct list_head *fn_list);



extern int dccp_insert_options(struct sock *sk, struct sk_buff *skb);

extern int dccp_insert_options_rsk(struct dccp_request_sock*, struct sk_buff*);

extern int dccp_insert_option_elapsed_time(struct sock *sk,

net/dccp/ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) 


static void dccp_v4_reqsk_destructor(struct request_sock *req)

{

	dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);

	kfree(inet_rsk(req)->opt);

}

net/dccp/ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) 


static void dccp_v6_reqsk_destructor(struct request_sock *req)

{

	dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);

	if (inet6_rsk(req)->pktopts != NULL)

		kfree_skb(inet6_rsk(req)->pktopts);

}

net/dccp/proto.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void dccp_destroy_sock(struct sock *sk) 
	dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;



	/* clean up feature negotiation state */

	dccp_feat_clean(dmsk);

	dccp_feat_list_purge(&dp->dccps_featneg);

}



EXPORT_SYMBOL_GPL(dccp_destroy_sock);