netdev - [PATCH] tuntap: reset network header before calling skb_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1355755160.10504.25.camel@edumazet-glaptop>
Date:	Mon, 17 Dec 2012 06:39:20 -0800
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Daniel Borkmann <danborkmann@...earbox.net>,
	David Miller <davem@...emloft.net>
Cc:	"Kirill A. Shutemov" <kirill@...temov.name>, maxk@....qualcomm.com,
	netdev@...r.kernel.org, dwmw2@...radead.org
Subject: [PATCH] tuntap: reset network header before calling
 skb_get_rxhash()

From: Eric Dumazet <edumazet@...gle.com>

Commit 499744209b2c (tuntap: dont use skb after netif_rx_ni(skb))
introduced another bug.

skb_get_rxhash() needs to access the network header, and it was
set for us in netif_rx_ni().

We need to reset network header or else skb_flow_dissect() behavior
is out of control.

Reported-and-tested-by: Kirill A. Shutemov <kirill@...temov.name>
Tested-by: Daniel Borkmann <daniel.borkmann@....ee.ethz.ch>
Signed-off-by: Eric Dumazet <edumazet@...gle.com>
---
 drivers/net/tun.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 255a9f5..173acf5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1199,6 +1199,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
 		skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
 	}
 
+	skb_reset_network_header(skb);
 	rxhash = skb_get_rxhash(skb);
 	netif_rx_ni(skb);
 


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html