From: Arnd Bergmann <arnd@arndb.de>
To: Jiri Pirko <jiri@resnulli.us>
Cc: Tom Herbert <tom@herbertland.com>,
"David S. Miller" <davem@davemloft.net>,
Alexander Duyck <aduyck@mirantis.com>,
Jiri Pirko <jiri@mellanox.com>,
Hadar Hen Zion <hadarh@mellanox.com>,
Gao Feng <fgao@48lvckh6395k16k5.yundunddos.com>,
Amir Vadai <amir@vadai.me>,
Linux Kernel Network Developers <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH net-next] flow_dissector: fix vlan tag handling
Date: Mon, 24 Oct 2016 18:00:32 +0200 [thread overview]
Message-ID: <28288577.YZfdMibjpz@wuerfel> (raw)
In-Reply-To: <20161024081736.GB2781@nanopsycho>
On Monday, October 24, 2016 10:17:36 AM CEST Jiri Pirko wrote:
> Sat, Oct 22, 2016 at 10:30:08PM CEST, arnd@arndb.de wrote:
> >diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
> >index 44e6ba9d3a6b..17be1b66cc41 100644
> >--- a/net/core/flow_dissector.c
> >+++ b/net/core/flow_dissector.c
> >@@ -246,13 +246,10 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
> > case htons(ETH_P_8021AD):
> > case htons(ETH_P_8021Q): {
> > const struct vlan_hdr *vlan;
> >+ struct vlan_hdr _vlan;
> >+ bool vlan_tag_present = (skb && skb_vlan_tag_present(skb));
>
> Drop the unnecessary "()"
ok
> >
> >- if (skb && skb_vlan_tag_present(skb))
> >- proto = skb->protocol;
>
> This does not look correct. I believe that you need to set proto for
> further processing.
>
Ah, of course. I only looked at the usage in this 'case' statement,
but the variable is also used after the 'goto again' and at
the end of the function.
Arnd
next prev parent reply other threads:[~2016-10-24 16:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 15:55 [PATCH] flow_dissector: avoid uninitialized variable access Arnd Bergmann
2016-10-21 16:31 ` Jiri Pirko
2016-10-21 21:05 ` Arnd Bergmann
2016-10-21 22:16 ` Arnd Bergmann
2016-10-22 15:57 ` Eric Garver
2016-10-22 18:20 ` Tom Herbert
2016-10-22 20:30 ` [PATCH net-next] flow_dissector: fix vlan tag handling Arnd Bergmann
2016-10-24 8:17 ` Jiri Pirko
2016-10-24 16:00 ` Arnd Bergmann [this message]
2016-10-22 1:48 ` [PATCH] flow_dissector: avoid uninitialized variable access Linus Torvalds
2016-10-22 6:55 ` Jiri Pirko
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=28288577.YZfdMibjpz@wuerfel \
--to=arnd@arndb.de \
--cc=aduyck@mirantis.com \
--cc=amir@vadai.me \
--cc=davem@davemloft.net \
--cc=fgao@48lvckh6395k16k5.yundunddos.com \
--cc=hadarh@mellanox.com \
--cc=jiri@mellanox.com \
--cc=jiri@resnulli.us \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tom@herbertland.com \
--cc=torvalds@linux-foundation.org \
/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).