Patchwork [lucid/fsl-imx51,CVE,2/2] gro: reset skb_iif on reuse

login
register
mail settings
Submitter Andy Whitcroft
Date July 27, 2011, 3:20 p.m.
Message ID <1311780055-21853-3-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/107110/
State New
Headers show

Comments

Andy Whitcroft - July 27, 2011, 3:20 p.m.
From: Andy Gospodarek <andy@greyhouse.net>

commit 6d152e23ad1a7a5b40fef1f42e017d66e6115159 upstream.

Like Herbert's change from a few days ago:

66c46d741e2e60f0e8b625b80edb0ab820c46d7a gro: Reset dev pointer on reuse

this may not be necessary at this point, but we should still clean up
the skb->skb_iif.  If not we may end up with an invalid valid for
skb->skb_iif when the skb is reused and the check is done in
__netif_receive_skb.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

CVE-2011-1478
BugLink: http://bugs.launchpad.net/bugs/816549
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 net/core/dev.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index bed9dc3..8b1847c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2558,6 +2558,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;
+	skb->iif = 0;
 
 	napi->skb = skb;
 }