Commit 66c46d74 authored Jan 29, 2011 by Herbert Xu Committed by David S. Miller Jan 29, 2011

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8f2771f2

net/core/dev.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message