Message ID | 1355755160.10504.25.camel@edumazet-glaptop |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 17 Dec 2012 06:39:20 -0800 > From: Eric Dumazet <edumazet@google.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@shutemov.name> > Tested-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> > Signed-off-by: Eric Dumazet <edumazet@google.com> Applied, hopefully we've really resolved this fully now :) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);