[PATCH] flow disector: check if arp_eth is null rather than arp

From: Colin King
Date: Fri Jan 13 2017 - 08:35:48 EST


From: Colin Ian King <colin.king@xxxxxxxxxxxxx>

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.

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@xxxxxxxxxxxxx>
---
net/core/flow_dissector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index e3dffc7..fec48e9 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -409,7 +409,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
sizeof(_arp_eth), data,
hlen - sizeof(_arp),
&_arp_eth);
- if (!arp)
+ if (!arp_eth)
goto out_bad;

if (dissector_uses_key(flow_dissector,
--
2.10.2