From: Colin King <colin.king@canonical.com>
To: "David S . Miller" <davem@davemloft.net>,
Alexander Duyck <aduyck@mirantis.com>,
Jiri Pirko <jiri@mellanox.com>, Tom Herbert <tom@herbertland.com>,
Eric Dumazet <edumazet@google.com>,
Simon Horman <simon.horman@netronome.com>,
Hadar Hen Zion <hadarh@mellanox.com>, Gao Feng <fgao@ikuai8.com>,
Amir Vadai <amir@vadai.me>,
netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] flow disector: check if arp_eth is null rather than arp
Date: Fri, 13 Jan 2017 13:34:28 +0000 [thread overview]
Message-ID: <20170113133428.20130-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
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@canonical.com>
---
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
next reply other threads:[~2017-01-13 13:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 13:34 Colin King [this message]
2017-01-13 18:24 ` [PATCH] flow disector: check if arp_eth is null rather than arp Eric Dumazet
2017-01-13 18:25 ` Colin Ian King
2017-01-13 18:36 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170113133428.20130-1-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=aduyck@mirantis.com \
--cc=amir@vadai.me \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fgao@ikuai8.com \
--cc=hadarh@mellanox.com \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@netronome.com \
--cc=tom@herbertland.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).