From: Herbert Xu Date: Wed, 27 Jul 2011 13:16:28 +0000 (-0700) Subject: gro: Only reset frag0 when skb can be pulled X-Git-Tag: firefly_0821_release~7541^2~3120 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97edbc901240090ca75b81aa8955bcef8d570434;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9e19477991ad..33b5968e7381 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1688,9 +1688,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)