Re: rmmod ip_conntrack hangs.....

["Nishit Shah" <nishit@elitecore.com>]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Sorry for that !!!!!
                                    I am adding the attachment !!!!

Rgds,
Nishit Shah.

----- Original Message ----- 
From: "Patrick McHardy" <kaber@trash.net>
To: <nishit@elitecore.com>
Cc: "Yasuyuki KOZAKAI" <yasuyuki.kozakai@toshiba.co.jp>; "Netfilter
Development Mailinglist" <netfilter-devel@vger.kernel.org>
Sent: Thursday, October 11, 2007 10:46 AM
Subject: Re: rmmod ip_conntrack hangs.....


> nishit@elitecore.com wrote:
> > Hi,
> >          I am adding the patch that patrick had submitted.
>
>
> The patch doesn't apply because your mailer replaced tabs by spaces.
> Please resend as attachment, thanks.
>

[-- Attachment #2: rmmod_conntrack --]
[-- Type: application/octet-stream, Size: 2615 bytes --]

diff -Paur linux-2.6.16.13/include/linux/netfilter_ipv4/ip_conntrack_core.h linux-2.6.16.13-dev/include/linux/netfilter_ipv4/ip_conntrack_core.h
--- linux-2.6.16.13/include/linux/netfilter_ipv4/ip_conntrack_core.h	Wed May  3 03:08:44 2006
+++ linux-2.6.16.13-dev/include/linux/netfilter_ipv4/ip_conntrack_core.h	Fri Oct 12 19:39:45 2007
@@ -45,7 +45,7 @@
 	int ret = NF_ACCEPT;
 
 	if (ct) {
-		if (!is_confirmed(ct))
+		if (!is_confirmed(ct) && !is_dying(ct))
 			ret = __ip_conntrack_confirm(pskb);
 		ip_ct_deliver_cached_events(ct);
 	}
diff -Paur linux-2.6.16.13/include/net/netfilter/nf_conntrack_core.h linux-2.6.16.13-dev/include/net/netfilter/nf_conntrack_core.h
--- linux-2.6.16.13/include/net/netfilter/nf_conntrack_core.h	Wed May  3 03:08:44 2006
+++ linux-2.6.16.13-dev/include/net/netfilter/nf_conntrack_core.h	Fri Oct 12 19:40:52 2007
@@ -61,7 +61,7 @@
 	int ret = NF_ACCEPT;
 
 	if (ct) {
-		if (!nf_ct_is_confirmed(ct))
+		if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
 			ret = __nf_conntrack_confirm(pskb);
 		nf_ct_deliver_cached_events(ct);
 	}
diff -Paur linux-2.6.16.13/net/ipv4/netfilter/ip_conntrack_core.c linux-2.6.16.13-dev/net/ipv4/netfilter/ip_conntrack_core.c
--- linux-2.6.16.13/net/ipv4/netfilter/ip_conntrack_core.c	Wed May  3 03:08:44 2006
+++ linux-2.6.16.13-dev/net/ipv4/netfilter/ip_conntrack_core.c	Fri Oct 12 19:30:38 2007
@@ -1251,11 +1251,18 @@
 		if (h)
 			break;
 	}
-	if (!h)
+	if (!h){
 		h = LIST_FIND_W(&unconfirmed, do_iter,
 				struct ip_conntrack_tuple_hash *, iter, data);
-	if (h)
+		if (h){
+			struct ip_conntrack * ct = tuplehash_to_ctrack(h);
+			if (iter(ct, data))
+				set_bit(IPS_DYING_BIT, &ct->status);
+		}
+		h = NULL;
+	}else{
 		atomic_inc(&tuplehash_to_ctrack(h)->ct_general.use);
+	}
 	write_unlock_bh(&ip_conntrack_lock);
 
 	return h;
diff -Paur linux-2.6.16.13/net/netfilter/nf_conntrack_core.c linux-2.6.16.13-dev/net/netfilter/nf_conntrack_core.c
--- linux-2.6.16.13/net/netfilter/nf_conntrack_core.c	Wed May  3 03:08:44 2006
+++ linux-2.6.16.13-dev/net/netfilter/nf_conntrack_core.c	Fri Oct 12 19:38:23 2007
@@ -1504,11 +1504,18 @@
 		if (h)
 			break;
  	}
-	if (!h)
+	if (!h){
 		h = LIST_FIND_W(&unconfirmed, do_iter,
 				struct nf_conntrack_tuple_hash *, iter, data);
-	if (h)
+		if (h){
+			struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h);
+			if (iter(ct, data))
+				set_bit(IPS_DYING_BIT, &ct->status);
+		}
+		h = NULL;
+	}else{
 		atomic_inc(&nf_ct_tuplehash_to_ctrack(h)->ct_general.use);
+	}
 	write_unlock_bh(&nf_conntrack_lock);
 
 	return h;