[netfilter-cvslog] r3581 - trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2005-01-07 20:15:24 +0100 (Fri, 07 Jan 2005)
New Revision: 3581

Modified:
   trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
Log:
fixed memory leak



Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c	2005-01-07 03:04:15 UTC (rev 3580)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c	2005-01-07 19:15:24 UTC (rev 3581)
@@ -837,8 +837,6 @@
 	struct sk_buff *s, *s2;
 
 	for (s = NFCT_FRAG6_CB(skb)->orig; s;) {
-		nf_conntrack_put(s->nfct);
-		nf_conntrack_get(skb->nfct);
 		s->nfct = skb->nfct;
 		s->nfcache = skb->nfcache;
 
@@ -851,6 +849,7 @@
 			       NF_IP6_PRI_CONNTRACK_DEFRAG + 1);
 		s = s2;
 	}
+	nf_conntrack_put_reasm(skb);
 }
 
 int nf_ct_frag6_kfree_frags(struct sk_buff *skb)