From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Wed, 5 Nov 2008 07:56:30 +0000 (-0800)
Subject: dccp: Cleanup routines for feature negotiation
X-Git-Tag: v2.6.29-rc1~581^2~758
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=d99a7bd210a14001007fc5233597c78877f0a11c;p=net-next-2.6.git

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: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index cbf522dfecc..528baa2e5be 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -545,6 +545,7 @@ out:
 
 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
index 4e172ccfd76..4aa1148cdb2 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -304,6 +304,7 @@ done:
 
 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
index 1cdf4ae9960..dafcefd8659 100644
--- 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);