From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Subject: [PATCH net-next 2/6] netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3()
Date: Mon, 14 Nov 2022 11:41:02 +0100 [thread overview]
Message-ID: <20221114104106.8719-3-pablo@netfilter.org> (raw)
In-Reply-To: <20221114104106.8719-1-pablo@netfilter.org>
From: Peng Wu <wupeng58@huawei.com>
In nft_inner_parse_l2l3(), the return value of skb_header_pointer() is
'veth' instead of 'eth' when case 'htons(ETH_P_8021Q)' and fix it.
Fixes: 3a07327d10a0 ("netfilter: nft_inner: support for inner tunnel header matching")
Signed-off-by: Peng Wu <wupeng58@huawei.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_inner.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nft_inner.c b/net/netfilter/nft_inner.c
index eae7caeff316..809f0d0787ec 100644
--- a/net/netfilter/nft_inner.c
+++ b/net/netfilter/nft_inner.c
@@ -72,7 +72,7 @@ static int nft_inner_parse_l2l3(const struct nft_inner *priv,
break;
case htons(ETH_P_8021Q):
veth = skb_header_pointer(pkt->skb, off, sizeof(_veth), &_veth);
- if (!eth)
+ if (!veth)
return -1;
outer_llproto = veth->h_vlan_encapsulated_proto;
--
2.30.2
next prev parent reply other threads:[~2022-11-14 10:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 10:41 [PATCH net-next 0/6] Netfilter updates for net-next Pablo Neira Ayuso
2022-11-14 10:41 ` [PATCH net-next 1/6] netfilter: nft_payload: use __be16 to store gre version Pablo Neira Ayuso
2022-11-14 10:41 ` Pablo Neira Ayuso [this message]
2022-11-14 10:41 ` [PATCH net-next 3/6] netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters Pablo Neira Ayuso
2022-11-15 3:04 ` Jakub Kicinski
2022-11-15 9:40 ` Pablo Neira Ayuso
2022-11-14 10:41 ` [PATCH net-next 4/6] netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET Pablo Neira Ayuso
2022-11-14 10:41 ` [PATCH net-next 5/6] netfilter: rpfilter/fib: clean up some inconsistent indenting Pablo Neira Ayuso
2022-11-14 10:41 ` [PATCH net-next 6/6] netfilter: conntrack: use siphash_4u64 Pablo Neira Ayuso
2022-11-15 3:02 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2022-11-15 9:59 [PATCH net-next,v2 0/6] Netfilter updates for net-next Pablo Neira Ayuso
2022-11-15 9:59 ` [PATCH net-next 2/6] netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3() Pablo Neira Ayuso
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=20221114104106.8719-3-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.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).