Commit: 97edbc901240090ca75b81aa8955bcef8d570434 - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

Commit MetaInfo

• Revision: 97edbc901240090ca75b81aa8955bcef8d570434 (tree)
• Time: 2011-08-05 13:58:31
• Author: Herbert Xu <herbert@gond...>
• Commiter: Greg Kroah-Hartman

Log Message

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 <[e-mail]>
Signed-off-by: David S. Miller <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Change Summary

• modified: include/linux/netdevice.h

Incremental Difference

--- 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)