| From feaf597619a61226db012776d78053300ef89f82 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: [PATCH] gro: Only reset frag0 when skb can be pulled |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h |
| index 0af14f2..0899edf 100644 |
| --- a/include/linux/netdevice.h |
| +++ b/include/linux/netdevice.h |
| @@ -1261,9 +1261,12 @@ static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen) |
| 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) |
| -- |
| 1.7.7 |
| |
