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

[Ben Hutchings]

Author: benh
Date: Mon Nov 28 03:18:43 2011
New Revision: 18328

Log:
gro: reset vlan_tci on reuse

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/gro-reset-vlan_tci-on-reuse.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/40

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Nov 27 20:59:40 2011	(r18327)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Nov 28 03:18:43 2011	(r18328)
@@ -42,6 +42,7 @@
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.49
     and the bug report which this closes: #650160.
+  * gro: reset vlan_tci on reuse
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 10 Nov 2011 02:28:55 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/gro-reset-vlan_tci-on-reuse.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/gro-reset-vlan_tci-on-reuse.patch	Mon Nov 28 03:18:43 2011	(r18328)
@@ -0,0 +1,44 @@
+From: Benjamin Poirier <bpoirier at suse.de>
+Subject: [PATCH net/stable] gro: reset vlan_tci on reuse
+Date: Sat, 26 Nov 2011 10:19:09 -0500
+
+This one liner is part of upstream
+commit 3701e51382a026cba10c60b03efabe534fba4ca4
+
+and it is in the same vein as
+commit 66c46d741e2e60f0e8b625b80edb0ab820c46d7a
+commit 6d152e23ad1a7a5b40fef1f42e017d66e6115159
+
+which are already in -stable.
+
+For drivers using the vlan_gro_frags() interface, a packet with invalid tci
+leads to GRO_DROP and napi_reuse_skb(). The skb has to be sanitized before
+being reused or we'll send skb's with invalid vlan_tci up the stack where
+they're not expected.
+
+Signed-off-by: Benjamin Poirier <bpoirier at suse.de>
+Cc: Jesse Gross <jesse at nicira.com>
+
+---
+
+Please note, reusing skb's with an invalid vlan_tci can cause panics on
+2.6.32.y -stable kernels.
+
+ net/core/dev.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 64eb849..84a0705 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2614,6 +2614,7 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
+ {
+ 	__skb_pull(skb, skb_headlen(skb));
+ 	skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
++	skb->vlan_tci = 0;
+ 	skb->dev = napi->dev;
+ 	skb->iif = 0;
+ 
+-- 
+1.7.7
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/40
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/40	Sun Nov 27 20:59:40 2011	(r18327)
+++ dists/squeeze/linux-2.6/debian/patches/series/40	Mon Nov 28 03:18:43 2011	(r18328)
@@ -29,3 +29,5 @@
 - bugfix/all/tty-Make-tiocgicount-a-handler.patch
 + bugfix/all/stable/2.6.32.49.patch
 + debian/tty-Avoid-ABI-change-for-addition-of-get_icount.patch
+
++ bugfix/all/gro-reset-vlan_tci-on-reuse.patch