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

[Simon Horman]

Author: horms
Date: 2005-08-02 06:24:38 +0000 (Tue, 02 Aug 2005)
New Revision: 3671

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.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:
Fix deadlock in ip6_queue

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff	2005-08-02 06:23:11 UTC (rev 3670)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/175-net-ipv6-netfilter-deadlock.diff	2005-08-02 06:24:38 UTC (rev 3671)
@@ -0,0 +1,33 @@
+From stable-bounces at linux.kernel.org  Fri Jul 22 00:35:49 2005
+Date: Fri, 22 Jul 2005 09:35:34 +0200
+From: Patrick McHardy <kaber at trash.net>
+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]: Fix deadlock in ip6_queue
+
+[NETFILTER]: Fix deadlock in ip6_queue
+
+Already fixed in ip_queue, ip6_queue was missed.
+
+Signed-off-by: Patrick McHardy <kaber at trash.net>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+
+ net/ipv6/netfilter/ip6_queue.c |    2 ++
+ 1 files changed, 2 insertions(+)
+
+Index: linux-2.6.12.y/net/ipv6/netfilter/ip6_queue.c
+===================================================================
+--- linux-2.6.12.y.orig/net/ipv6/netfilter/ip6_queue.c
++++ linux-2.6.12.y/net/ipv6/netfilter/ip6_queue.c
+@@ -76,7 +76,9 @@ static DECLARE_MUTEX(ipqnl_sem);
+ static void
+ ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict)
+ {
++	local_bh_disable();
+ 	nf_reinject(entry->skb, entry->info, verdict);
++	local_bh_enable();
+ 	kfree(entry);
+ }
+ 

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:23:11 UTC (rev 3670)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-08-02 06:24:38 UTC (rev 3671)
@@ -40,8 +40,12 @@
      Fix potential memory corruption in NAT code (aka memory NAT)
      (Simon Horman)
 
- -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 16:30:59 +0900
+  * 175-net-ipv6-netfilter-deadlock.diff
+    Fix deadlock in ip6_queue
+    (Simon Horman)
 
+ -- Simon Horman <horms at debian.org>  Tue,  2 Aug 2005 16:34:45 +0900
+
 kernel-source-2.4.27 (2.4.27-10) unstable; urgency=low
 
   * 155_net-bluetooth-signdness-fix.diff:

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:23:11 UTC (rev 3670)
+++ 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:38 UTC (rev 3671)
@@ -7,3 +7,4 @@
 + 172_ppc32-time_offset-misuse.diff
 + 173_v4l-cx88-hue-offset-fix.diff
 + 174_net-ipv4-netfilter-nat-mem.diff
++ 175-net-ipv6-netfilter-deadlock.diff