dccp: Cleanup routines for feature negotiation

Gerrit Renker · davem330 · commit d99a7bd210a1 · 2008-11-04T23:56:30.000-08:00
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: Gerrit Renker &lt;gerrit@erg.abdn.ac.uk&gt;
Acked-by: Ian McDonald &lt;ian.mcdonald@jandi.co.nz&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
@@ -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);
 }
 
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
@@ -304,6 +304,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);
 }
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,7 @@ static void dccp_v4_ctl_send_reset(struct sock sk, struct sk_buff rxskb)`
`545`	`545`
`546`	`546`	`static void dccp_v4_reqsk_destructor(struct request_sock *req)`
`547`	`547`	`{`
	`548`	`+ dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);`
`548`	`549`	`kfree(inet_rsk(req)->opt);`
`549`	`550`	`}`
`550`	`551`
Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ static int dccp_v6_send_response(struct sock sk, struct request_sock req)`
`304`	`304`
`305`	`305`	`static void dccp_v6_reqsk_destructor(struct request_sock *req)`
`306`	`306`	`{`
	`307`	`+ dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);`
`307`	`308`	`if (inet6_rsk(req)->pktopts != NULL)`
`308`	`309`	`kfree_skb(inet6_rsk(req)->pktopts);`
`309`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ void dccp_destroy_sock(struct sock *sk)`
`268`	`268`	`dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;`
`269`	`269`
`270`	`270`	`/* clean up feature negotiation state */`
`271`		`- dccp_feat_clean(dmsk);`
	`271`	`+ dccp_feat_list_purge(&dp->dccps_featneg);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`EXPORT_SYMBOL_GPL(dccp_destroy_sock);`