nft: fix ebtables among match when mac+ip addresses are used
Florian Westphal
maintainerPATCH 1/1 nft: fix ebtables among match when mac+ip addresses are used
When matching mac and ip addresses, the ip address needs to be placed into then 2nd 32bit register, the switch to dynamic register allocation instead re-uses reg1, this partially clobbers the mac address, so set lookup comes up empty even though it should find a match.
Fixes 7e38890c6b4fb ("nft: prepare for dynamic register allocation")
Reported-by Yi Chen <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
--- iptables/nft.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
iptables/nft.c +2 -2
@@ -1208,8 +1208,8 @@ static int __add_nft_among(struct nft_handle *h, const char *table,nftnl_rule_add_expr (r, e);if (ip) { - e =gen_payload (h,NFT_PAYLOAD_NETWORK_HEADER , ip_addr_off[dst], -sizeof (struct in_addr ), ®); + e =__gen_payload (NFT_PAYLOAD_NETWORK_HEADER , ip_addr_off[dst], +sizeof (struct in_addr ),NFT_REG32_02 );if (!e)return -ENOMEM ;nftnl_rule_add_expr (r, e);
Signature · 1 line
2.35.1