diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-12-17 04:39:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-17 12:32:44 -0800 |
| commit | 76fe45812a3b134c39170ca32dfd4b7217d33145 (patch) | |
| tree | 16b06e30c9e77aad14229f19fa84e73eefbaebb9 /drivers/net/tun.c | |
| parent | df4841910758227cfc07ae645de781d687b3b215 (diff) | |
| download | op-kernel-dev-76fe45812a3b134c39170ca32dfd4b7217d33145.zip op-kernel-dev-76fe45812a3b134c39170ca32dfd4b7217d33145.tar.gz | |
tuntap: reset network header before calling skb_get_rxhash()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |
