diff options
| author | Phil Sutter <phil@nwl.cc> | 2022-12-01 13:03:49 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-12-02 01:47:32 +0100 |
| commit | 39589b3edb7c0ea3e64777c7f4cdbf45be55ce53 (patch) | |
| tree | 267f5398896ab802f3505b4a4e93cf0d103e3fb1 | |
| parent | ba1c0fe89eb56f8bf25f9165f2e5dc366ea0118c (diff) | |
ebtables: Fix MAC address match translation
If a mask was present, ebtables-translate would emit illegal syntax.
Fixes: 5e2b473a64bc7 ("xtables-compat: extend generic tests for masks and wildcards")
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rw-r--r-- | extensions/generic.txlate | 2 | ||||
| -rw-r--r-- | iptables/nft-bridge.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/generic.txlate b/extensions/generic.txlate index d7ddf6a3..c24ed156 100644 --- a/extensions/generic.txlate +++ b/extensions/generic.txlate @@ -65,7 +65,7 @@ ebtables-translate -A FORWARD ! -i iname --logical-in ilogname -o out+ --logical nft 'add rule bridge filter FORWARD iifname != "iname" meta ibrname "ilogname" oifname "out*" meta obrname "lout*" ether daddr 01:02:03:04:de:af counter' ebtables-translate -I INPUT -p ip -d 1:2:3:4:5:6/ff:ff:ff:ff:00:00 -nft 'insert rule bridge filter INPUT ether type 0x800 ether daddr 01:02:03:04:00:00 and ff:ff:ff:ff:00:00 == 01:02:03:04:00:00 counter' +nft 'insert rule bridge filter INPUT ether type 0x800 ether daddr and ff:ff:ff:ff:00:00 == 01:02:03:04:00:00 counter' ebtables-translate -I INPUT -p Length nft 'insert rule bridge filter INPUT ether type < 0x0600 counter' diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c index 8d002c17..e223d197 100644 --- a/iptables/nft-bridge.c +++ b/iptables/nft-bridge.c @@ -866,17 +866,17 @@ static void nft_bridge_xlate_mac(struct xt_xlate *xl, const char *type, bool inv xt_xlate_add(xl, "ether %s %s", type, invert ? "!= " : ""); - xlate_mac(xl, mac); - if (memcmp(mask, one_msk, ETH_ALEN)) { int i; - xt_xlate_add(xl, " and "); + xt_xlate_add(xl, "and"); xlate_mac(xl, mask); xt_xlate_add(xl, " == %02x", mac[0] & mask[0]); for (i=1; i < ETH_ALEN; i++) xt_xlate_add(xl, ":%02x", mac[i] & mask[i]); + } else { + xlate_mac(xl, mac); } } |