[kernel] r16780 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Ian Campbell]

Author: ijc-guest
Date: Wed Jan  5 16:32:03 2011
New Revision: 16780

Log:
xen: netback: drop SKBs which are GSO but do not have a partial checksum set (Closes: #608144)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netback-Drop-GSO-SKBs-which-do-not-have-csum_b.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30-extra

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Jan  5 14:26:23 2011	(r16779)
+++ dists/sid/linux-2.6/debian/changelog	Wed Jan  5 16:32:03 2011	(r16780)
@@ -42,6 +42,8 @@
   [ Ian Campbell ]
   * xen: backport TTM patches to use PCI API. Fixes PCIe GPU (specifically
     Radeon and Nouveau) on Xen (Closes: #601341).
+  * xen: netback: drop SKBs which are GSO but do not have a partial
+    checksum set (Closes: #608144).
 
   [ dann frazier ]
   * exec: make argv/envp memory visible to oom-killer (CVE-2010-4243)
@@ -55,7 +57,7 @@
   * inotify: stop kernel memory leak on file creation failure (CVE-2010-4250)
   * econet: Fix crash in aun_incoming() (CVE-2010-4342)
   * [SCSI] bfa: fix system crash when reading sysfs fc_host statistics (CVE-2010-4343)
-	
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 
 linux-2.6 (2.6.32-29) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netback-Drop-GSO-SKBs-which-do-not-have-csum_b.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netback-Drop-GSO-SKBs-which-do-not-have-csum_b.patch	Wed Jan  5 16:32:03 2011	(r16780)
@@ -0,0 +1,37 @@
+From e743bffb6f81ca64b22d552d9bbfe3f280dcf308 Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ian.campbell at citrix.com>
+Date: Wed, 5 Jan 2011 09:57:37 +0000
+Subject: [PATCH] xen: netback: Drop GSO SKBs which do not have csum_blank.
+
+The Linux network stack expects all GSO SKBs to have ip_summed ==
+CHECKSUM_PARTIAL (which implies that the frame contains a partial
+checksum) and the Xen network ring protocol similarly expects an SKB
+which has GSO set to also have NETRX_csum_blank (which also implies a
+partial checksum). Therefore drop such frames on receive otherwise
+they will trigger the warning in skb_gso_segment.
+
+Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
+Cc: Jeremy Fitzhardinge <jeremy at goop.org>
+Cc: xen-devel at lists.xensource.com
+---
+ drivers/xen/netback/netback.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/xen/netback/netback.c b/drivers/xen/netback/netback.c
+index 1e362f7..851721a 100644
+--- a/drivers/xen/netback/netback.c
++++ b/drivers/xen/netback/netback.c
+@@ -1513,6 +1513,10 @@ static void net_tx_submit(struct xen_netbk *netbk)
+ 				kfree_skb(skb);
+ 				continue;
+ 			}
++		} else if (skb_is_gso(skb)) {
++			DPRINTK("Dropping GSO but not CHECKSUM_PARTIAL skb\n");
++			kfree_skb(skb);
++			continue;
+ 		}
+ 
+ 		if (unlikely(netbk_copy_skb_mode == NETBK_ALWAYS_COPY_SKB) &&
+-- 
+1.5.6.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/30-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30-extra	Wed Jan  5 14:26:23 2011	(r16779)
+++ dists/sid/linux-2.6/debian/patches/series/30-extra	Wed Jan  5 16:32:03 2011	(r16780)
@@ -22,3 +22,4 @@
 + features/all/xen/radeon-ttm-PCIe-Use-dma_addr-if-TTM-has-set-it.patch featureset=xen
 + features/all/xen/nouveau-ttm-PCIe-Use-dma_addr-if-TTM-has-set-it.patch featureset=xen
 + features/all/xen/radeon-PCIe-Use-the-correct-index-field.patch featureset=xen
++ features/all/xen/xen-netback-Drop-GSO-SKBs-which-do-not-have-csum_b.patch featureset=xen