* gro: Reset dev pointer on reuse
@ 2011-01-30 4:10 Herbert Xu
2011-01-30 4:45 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Herbert Xu @ 2011-01-30 4:10 UTC (permalink / raw)
To: David S. Miller, netdev
Hi:
gro: Reset dev pointer on reuse
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>
diff --git a/net/core/dev.c b/net/core/dev.c
index 24ea2d7..93e44db 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3424,6 +3424,7 @@ static 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->vlan_tci = 0;
+ skb->dev = napi->dev;
napi->skb = skb;
}
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: gro: Reset dev pointer on reuse
2011-01-30 4:10 gro: Reset dev pointer on reuse Herbert Xu
@ 2011-01-30 4:45 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-01-30 4:45 UTC (permalink / raw)
To: herbert; +Cc: netdev
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 30 Jan 2011 15:10:47 +1100
> gro: Reset dev pointer on reuse
>
> 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>
Applied, thanks Herbert.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-30 4:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-30 4:10 gro: Reset dev pointer on reuse Herbert Xu
2011-01-30 4:45 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).