]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
flow dissector: check if arp_eth is null rather than arp
authorColin Ian King <colin.king@canonical.com>
Fri, 13 Jan 2017 18:48:20 +0000 (18:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Jan 2017 18:48:48 +0000 (13:48 -0500)
commit57b68ec2a7be9a7e9f8999850f8ee5baa49023e4
tree14d141beaf15ea3c11936e3eaa4211148c4d4f0a
parente89df813174d81abee8be8cabc047d69ef78c26d
flow dissector: check if arp_eth is null rather than arp

arp is being checked instead of arp_eth to see if the call to
__skb_header_pointer failed. Fix this by checking arp_eth is
null instead of arp.   Also fix to use length hlen rather than
hlen - sizeof(_arp); thanks to Eric Dumazet for spotting
this latter issue.

CoverityScan CID#1396428 ("Logically dead code") on 2nd
arp comparison (which should be arp_eth instead).

Fixes: commit 55733350e5e8b70c5 ("flow disector: ARP support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/flow_dissector.c