r3673 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-08-02 06:31:48 +0000 (Tue, 02 Aug 2005)
New Revision: 3673

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/176_net-ipv4-netfilter-untracked-refcount.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
Log:
Wait until all references to ip_conntrack_untracked are dropped on unload

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-02 06:24:49 UTC (rev 3672)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-02 06:31:48 UTC (rev 3673)
@@ -44,8 +44,11 @@
     Fix deadlock in ip6_queue
     (Simon Horman)
 
- -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 16:34:45 +0900
+  * 176_net-ipv4-netfilter-untracked-refcount.diff
+    Wait until all references to ip_conntrack_untracked are dropped on unload
 
+ -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 16:38:56 +0900
+
 kernel-source-2.4.27 (2.4.27-10) unstable; urgency=low
 
   * 155_net-bluetooth-signdness-fix.diff:

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/176_net-ipv4-netfilter-untracked-refcount.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/176_net-ipv4-netfilter-untracked-refcount.diff	2005-08-02 06:24:49 UTC (rev 3672)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/176_net-ipv4-netfilter-untracked-refcount.diff	2005-08-02 06:31:48 UTC (rev 3673)
@@ -0,0 +1,34 @@
+From stable-bounces at linux.kernel.org  Fri Jul 22 00:35:58 2005
+Date: Fri, 22 Jul 2005 09:35:51 +0200
+From: Patrick McHardy <kaber at trash.net>
+User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050602)
+To: "David S. Miller" <davem at davemloft.net>
+Cc: Netfilter Development Mailinglist <netfilter-devel at lists.netfilter.org>,
+        stable at kernel.org
+Subject: [PATCH][NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload
+
+[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload
+
+Fixes a crash when unloading ip_conntrack.
+
+Signed-off-by: Patrick McHardy <kaber at trash.net>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+
+ net/ipv4/netfilter/ip_conntrack_core.c |    3 +++
+ 1 files changed, 3 insertions(+)
+
+Index: linux-2.6.12.y/net/ipv4/netfilter/ip_conntrack_core.c
+===================================================================
+--- linux-2.6.12.y.orig/net/ipv4/netfilter/ip_conntrack_core.c
++++ linux-2.6.12.y/net/ipv4/netfilter/ip_conntrack_core.c
+@@ -1124,6 +1124,9 @@ void ip_conntrack_cleanup(void)
+ 		schedule();
+ 		goto i_see_dead_people;
+ 	}
++	/* wait until all references to ip_conntrack_untracked are dropped */
++	while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1)
++		schedule();
+ 
+ 	kmem_cache_destroy(ip_conntrack_cachep);
+ 	kmem_cache_destroy(ip_conntrack_expect_cachep);

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11	2005-08-02 06:24:49 UTC (rev 3672)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11	2005-08-02 06:31:48 UTC (rev 3673)
@@ -8,3 +8,4 @@
 + 173_v4l-cx88-hue-offset-fix.diff
 + 174_net-ipv4-netfilter-nat-mem.diff
 + 175-net-ipv6-netfilter-deadlock.diff
++ 176_net-ipv4-netfilter-untracked-refcount.diff