2.6.39 patches

diff --git a/queue-2.6.39/gro-only-reset-frag0-when-skb-can-be-pulled.patch b/queue-2.6.39/gro-only-reset-frag0-when-skb-can-be-pulled.patch
new file mode 100644 (file)
index 0000000..87c2502
--- /dev/null
+++ b/queue-2.6.39/gro-only-reset-frag0-when-skb-can-be-pulled.patch
@@ -0,0 +1,40 @@
+From 17dd759c67f21e34f2156abcf415e1f60605a188 Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Wed, 27 Jul 2011 06:16:28 -0700
+Subject: gro: Only reset frag0 when skb can be pulled
+
+From: Herbert Xu <herbert@gondor.apana.org.au>
+
+commit 17dd759c67f21e34f2156abcf415e1f60605a188 upstream.
+
+Currently skb_gro_header_slow unconditionally resets frag0 and
+frag0_len.  However, when we can't pull on the skb this leaves
+the GRO fields in an inconsistent state.
+
+This patch fixes this by only resetting those fields after the
+pskb_may_pull test.
+
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/netdevice.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -1680,9 +1680,12 @@ static inline int skb_gro_header_hard(st
+ static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
+                                       unsigned int offset)
+ {
++      if (!pskb_may_pull(skb, hlen))
++              return NULL;
++
+       NAPI_GRO_CB(skb)->frag0 = NULL;
+       NAPI_GRO_CB(skb)->frag0_len = 0;
+-      return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
++      return skb->data + offset;
+ }
+ 
+ static inline void *skb_gro_mac_header(struct sk_buff *skb)

diff --git a/queue-2.6.39/series b/queue-2.6.39/series
index 65f1e3532a7dfd8cd9bb1e3bc24c45b37a8d8840..fc479c23d12c26d4821e609d24f7bb6f53ca1925 100644 (file)
--- a/queue-2.6.39/series
+++ b/queue-2.6.39/series
@@ -67,3 +67,4 @@ vfs-fix-race-in-rcu-lookup-of-pruned-dentry.patch
 cifs-fix-wsize-negotiation-to-respect-max-buffer-size-and.patch
 cifs-lower-default-and-max-wsize-to-what-2.6.39-can-handle.patch
 bridge-send-proper-message_age-in-config-bpdu.patch
+gro-only-reset-frag0-when-skb-can-be-pulled.patch