From: Phil Sutter <phil@nwl.cc>
To: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 02/12] nft-bridge: nft_bridge_add() uses wrong flags
Date: Wed, 22 Nov 2023 14:02:12 +0100 [thread overview]
Message-ID: <20231122130222.29453-3-phil@nwl.cc> (raw)
In-Reply-To: <20231122130222.29453-1-phil@nwl.cc>
When checking whether -s or -d was given, invflags were used by
accident. This change has no functional effect since the values remain
the same, but this way it's clear where the previously assigned flags
are used.
Fixes: 07f4ca9681688 ("xtables-compat: ebtables: allow checking for zero-mac")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
iptables/nft-bridge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index d9a8ad2b0f373..772525e1b45a9 100644
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -134,14 +134,14 @@ static int nft_bridge_add(struct nft_handle *h, struct nft_rule_ctx *ctx,
struct ebt_entry *fw = &cs->eb;
uint32_t op;
- if (fw->bitmask & EBT_ISOURCE) {
+ if (fw->bitmask & EBT_SOURCEMAC) {
op = nft_invflags2cmp(fw->invflags, EBT_ISOURCE);
add_addr(h, r, NFT_PAYLOAD_LL_HEADER,
offsetof(struct ethhdr, h_source),
fw->sourcemac, fw->sourcemsk, ETH_ALEN, op);
}
- if (fw->bitmask & EBT_IDEST) {
+ if (fw->bitmask & EBT_DESTMAC) {
op = nft_invflags2cmp(fw->invflags, EBT_IDEST);
add_addr(h, r, NFT_PAYLOAD_LL_HEADER,
offsetof(struct ethhdr, h_dest),
--
2.41.0
next prev parent reply other threads:[~2023-11-22 12:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 13:02 [iptables PATCH 00/12] Misc fixes (more or less) Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 01/12] Makefile: Install arptables-translate link and man page Phil Sutter
2023-11-22 13:02 ` Phil Sutter [this message]
2023-11-22 13:02 ` [iptables PATCH 03/12] xshared: struct xt_cmd_parse::xlate is unused Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 04/12] xshared: All variants support -v Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 05/12] xshared: Drop needless assignment in --help case Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 06/12] xshared: Drop pointless CMD_REPLACE check Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 07/12] tests: xlate: Print failing command line Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 08/12] ebtables: Drop append_entry() wrapper Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 09/12] ebtables: Make ebt_load_match_extensions() static Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 10/12] ebtables: Align line number formatting with legacy Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 11/12] xshared: do_parse: Ignore '-j CONTINUE' Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 12/12] ebtables: Implement --change-counters command Phil Sutter
2023-11-23 16:55 ` [iptables PATCH 00/12] Misc fixes (more or less) Phil Sutter
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=20231122130222.29453-3-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.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).