diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-01-29 20:44:54 -0800 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 10:57:06 -0400 |
| commit | ec52b9005a454e0a4e3e1c1a04222fcc0a4073fc (patch) | |
| tree | 68f4bbc6615f58a252783e238ec6536724f49ce3 /net | |
| parent | ebe451b0dd80704dc56e06c35690a47d26be149b (diff) | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 309593439ae..19a74f60e4b 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; } |