Commit 57b68ec2 authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller

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 55733350 ("flow disector: ARP support")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e89df813
...@@ -407,9 +407,9 @@ bool __skb_flow_dissect(const struct sk_buff *skb, ...@@ -407,9 +407,9 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
arp_eth = __skb_header_pointer(skb, nhoff + sizeof(_arp), arp_eth = __skb_header_pointer(skb, nhoff + sizeof(_arp),
sizeof(_arp_eth), data, sizeof(_arp_eth), data,
hlen - sizeof(_arp), hlen,
&_arp_eth); &_arp_eth);
if (!arp) if (!arp_eth)
goto out_bad; goto out_bad;
if (dissector_uses_key(flow_dissector, if (dissector_uses_key(flow_dissector,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment