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

[Ben Hutchings]

Author: benh
Date: Wed Sep 15 22:53:18 2010
New Revision: 16285

Log:
gro: Fix bogus gso_size on the first fraglist entry (Closes: #596802)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/gro-Fix-bogus-gso_size-on-the-first-fraglist-entry.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/23

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Sep 15 12:42:10 2010	(r16284)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 15 22:53:18 2010	(r16285)
@@ -3,6 +3,7 @@
   [ Ben Hutchings ]
   * cgroupfs: create /sys/fs/cgroup to mount cgroupfs on (Closes: #595964)
   * r8169: Fix MDIO timing (Closes: #583139; mistakenly reverted in 2.6.32-19)
+  * gro: Fix bogus gso_size on the first fraglist entry (Closes: #596802)
 
   [ maximilian attems ]
   * openvz: cfq-iosched: do not force idling for sync workload.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/gro-Fix-bogus-gso_size-on-the-first-fraglist-entry.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/gro-Fix-bogus-gso_size-on-the-first-fraglist-entry.patch	Wed Sep 15 22:53:18 2010	(r16285)
@@ -0,0 +1,37 @@
+From: Herbert Xu <herbert at gondor.apana.org.au>
+Date: Thu, 20 May 2010 23:07:56 -0700
+Subject: [PATCH] gro: Fix bogus gso_size on the first fraglist entry
+
+commit 622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3 upstream.
+
+When GRO produces fraglist entries, and the resulting skb hits
+an interface that is incapable of TSO but capable of FRAGLIST,
+we end up producing a bogus packet with gso_size non-zero.
+
+This was reported in the field with older versions of KVM that
+did not set the TSO bits on tuntap.
+
+This patch fixes that.
+
+Reported-by: Igor Zhang <yugzhang at redhat.com>
+Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/core/skbuff.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index c543dd2..4c11000 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -2718,6 +2718,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
+ 	*NAPI_GRO_CB(nskb) = *NAPI_GRO_CB(p);
+ 	skb_shinfo(nskb)->frag_list = p;
+ 	skb_shinfo(nskb)->gso_size = pinfo->gso_size;
++	pinfo->gso_size = 0;
+ 	skb_header_release(p);
+ 	nskb->prev = p;
+ 
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/23
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/23	Wed Sep 15 12:42:10 2010	(r16284)
+++ dists/sid/linux-2.6/debian/patches/series/23	Wed Sep 15 22:53:18 2010	(r16285)
@@ -1,3 +1,4 @@
 + features/all/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
 + bugfix/all/r8169-fix-random-mdio_write-failures.patch
 + bugfix/all/r8169-fix-mdio_read-and-update-mdio_write.patch
++ bugfix/all/gro-Fix-bogus-gso_size-on-the-first-fraglist-entry.patch