]> git.baikalelectronics.ru Git - 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)
commit7aae2998ea9842ae176d5021ee460b3a8c87e072
tree14d141beaf15ea3c11936e3eaa4211148c4d4f0a
parent6023072f0102a517b8c3cd3ab7a24d53f2645628
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 fa6f2a54d7ac8afd5 ("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