segtree: fix map listing with interface wildcard
Pablo Neira Ayuso
maintainerPATCH 1/1 segtree: fix map listing with interface wildcard
# nft -f - <<'EOF'
table inet filter {
chain INPUT {
iifname vmap {
"eth0" : jump input_lan,
"wg*" : jump input_vpn
}
}
chain input_lan {}
chain input_vpn {}
}
EOF
# nft list ruleset
nft: segtree.c:578: interval_map_decompose: Assertion `low->len / 8 > 0' failed.Fixes 5e393ea1fc0a ("segtree: add string "range" reversal support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/segtree.c | 2 +- .../shell/testcases/sets/dumps/sets_with_ifnames.nft | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
src/segtree.c +1 -1
@@ -575,7 +575,7 @@ void interval_map_decompose(struct expr *set)if (!mpz_cmp_ui (range,0 )) {if (expr_basetype (low)->type ==TYPE_STRING ) -mpz_switch_byteorder (expr_value (low)->value, low->len /BITS_PER_BYTE ); +mpz_switch_byteorder (expr_value (low)->value,expr_value (low)->len /BITS_PER_BYTE ); low->flags |=EXPR_F_KERNEL ;compound_expr_add (set,expr_get (low)); }else if (range_is_prefix (range) && !mpz_cmp_ui (p,0 )) {
tests/shell/testcases/sets/dumps/sets_with_ifnames.nft +11 -0
@@ -29,11 +29,19 @@ table inet testifsets { 12.2.2.0/24 . "abcdef*" } } + map map_wild { + type ifname : verdict + flags interval + elements = { "abcdef*" : jump do_nothing, + "eth0" : jump do_nothing } + } + chain v4icmp { iifname @simple counter packets 0 bytes 0 iifname @simple_wild counter packets 0 bytes 0 iifname { "eth0", "abcdef0" } counter packets 0 bytes 0 iifname { "abcdef*", "eth0" } counter packets 0 bytes 0 + iifname vmap @map_wild } chain v4icmpc {
@@ -48,4 +56,7 @@ table inet testifsets { ip protocol icmp jump v4icmp ip protocol icmp goto v4icmpc } + + chain do_nothing { + } }
Signature · 1 line
2.30.2