diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-07-27 06:16:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 10:35:52 -0700 |
| commit | d2b8665554f9c074e7290801584b1a1a82d2ed27 (patch) | |
| tree | 070d519111a4904d627a57c532f77fba5aa5d2b4 | |
| parent | 2ffd234414626d3e60c37359cf43bfceee2feff9 (diff) | |
| download | lwn-d2b8665554f9c074e7290801584b1a1a82d2ed27.tar.gz lwn-d2b8665554f9c074e7290801584b1a1a82d2ed27.zip | |
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: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 992c700231dc..6782a1e947bb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1226,9 +1226,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) |