[kernel] r17397 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun May 15 14:04:58 2011
New Revision: 17397

Log:
bridge: Fix forwarding of IPv6 (regression in 2.6.38.4; closes: #625914)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/bridge-fix-forwarding-of-IPv6.patch
   dists/sid/linux-2.6/debian/patches/series/6
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri May 13 12:35:48 2011	(r17396)
+++ dists/sid/linux-2.6/debian/changelog	Sun May 15 14:04:58 2011	(r17397)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.38-6) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * bridge: Fix forwarding of IPv6 (regression in 2.6.38.4; closes: #625914)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 15 May 2011 15:03:21 +0100
+
 linux-2.6 (2.6.38-5) unstable; urgency=medium
 
   [ Thorsten Glaser ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/bridge-fix-forwarding-of-IPv6.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/bridge-fix-forwarding-of-IPv6.patch	Sun May 15 14:04:58 2011	(r17397)
@@ -0,0 +1,27 @@
+Date: Fri, 13 May 2011 12:53:14 -0700
+From: Stephen Hemminger <shemminger at vyatta.com>
+Subject: [PATCH] bridge: fix forwarding of IPv6
+
+The commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e
+    bridge: Reset IPCB when entering IP stack on NF_FORWARD
+broke forwarding of IPV6 packets in bridge because it would
+call bp_parse_ip_options with an IPV6 packet.
+
+Reported-by: Noah Meyerhans <noahm at debian.org>
+Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
+
+---
+Patch against net-next-2.6 but must be applied to net-2.6
+and stable as well
+
+--- a/net/bridge/br_netfilter.c	2011-05-13 12:37:30.289646958 -0700
++++ b/net/bridge/br_netfilter.c	2011-05-13 12:38:07.820333938 -0700
+@@ -737,7 +737,7 @@ static unsigned int br_nf_forward_ip(uns
+ 		nf_bridge->mask |= BRNF_PKT_TYPE;
+ 	}
+ 
+-	if (br_parse_ip_options(skb))
++	if (pf == PF_INET && br_parse_ip_options(skb))
+ 		return NF_DROP;
+ 
+ 	/* The physdev module checks on this */

Added: dists/sid/linux-2.6/debian/patches/series/6
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/6	Sun May 15 14:04:58 2011	(r17397)
@@ -0,0 +1 @@
++ bugfix/all/bridge-fix-forwarding-of-IPv6.patch