From: Eric Dumazet <edumazet@google.com>
Date: Tue, 17 Oct 2017 10:07:44 -0700
Subject: tun: relax check on eth_get_headlen() return value
Patch-mainline: v4.15-rc1
Git-commit: 010f245b9dd734adda6386c494a4ace953ea8dc4
References: bsc#1109837
syzkaller hit the WARN() in tun_get_user(), providing skb
with payload in fragments only, and nothing in skb->head
GRO layer is fine with this, so relax the check.
Fixes: 90e33d459407 ("tun: enable napi_gro_frags() for TUN/TAP driver")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/tun.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1738,7 +1738,7 @@ static ssize_t tun_get_user(struct tun_s
/* Exercise flow dissector code path. */
u32 headlen = eth_get_headlen(skb->data, skb_headlen(skb));
- if (headlen > skb_headlen(skb) || headlen < ETH_HLEN) {
+ if (unlikely(headlen > skb_headlen(skb))) {
this_cpu_inc(tun->pcpu_stats->rx_dropped);
napi_free_frags(&tfile->napi);
mutex_unlock(&tfile->napi_mutex);