From patchwork Wed Jul 27 15:20:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [lucid/fsl-imx51,CVE,2/2] gro: reset skb_iif on reuse Date: Wed, 27 Jul 2011 05:20:53 -0000 From: Andy Whitcroft X-Patchwork-Id: 107110 Message-Id: <1311780055-21853-3-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com From: Andy Gospodarek 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 Signed-off-by: David S. Miller Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman 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 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; }