From patchwork Wed Jul 27 15:20:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [maverick/ti-omap4,CVE,1/2] gro: Reset dev pointer on reuse Date: Wed, 27 Jul 2011 05:20:54 -0000 From: Andy Whitcroft X-Patchwork-Id: 107107 Message-Id: <1311780055-21853-4-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com From: Herbert Xu 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 Signed-off-by: David S. Miller Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andi Kleen Signed-off-by: Tim Gardner CVE-2011-1478 BugLink: http://bugs.launchpad.net/bugs/816549 Signed-off-by: Andy Whitcroft --- 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 d11a74d..d64bb2b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3222,6 +3222,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; }