From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 30 Jan 2011 04:44:54 +0000 (-0800)
Subject: gro: Reset dev pointer on reuse
X-Git-Tag: v2.6.34.11~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec52b9005a454e0a4e3e1c1a04222fcc0a4073fc;p=thirdparty%2Fkernel%2Fstable.git

gro: Reset dev pointer on reuse

commit 66c46d741e2e60f0e8b625b80edb0ab820c46d7a upstream.

On older kernels the VLAN code may zero skb->dev before dropping
it and causing it to be reused by GRO.

Unfortunately we didn't reset skb->dev in that case which causes
the next GRO user to get a bogus skb->dev pointer.

This particular problem no longer happens with the current upstream
kernel due to changes in VLAN processing.

However, for correctness we should still reset the skb->dev pointer
in the GRO reuse function in case a future user does the same thing.

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/net/core/dev.c b/net/core/dev.c
index 309593439ae47..19a74f60e4b5c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2822,6 +2822,7 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
 {
 	__skb_pull(skb, skb_headlen(skb));
 	skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
+	skb->dev = napi->dev;
 
 	napi->skb = skb;
 }