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.

Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1617
Fixes: 5e393ea1fc0a ("segtree: add string "range" reversal support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/segtree.c b/src/segtree.c
index f9cac373a5f05c00822b46e564642b47e1249863..c36497ce62533616ba8368a3cf0b07a999cf73cb 100644 (file)
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -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)) {

diff --git a/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft b/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
index 6b073ae2d090cdbbf4f3a8ee8132d910731c8791..77a8baf58cef26a89ca77cc34a9bd580265222b6 100644 (file)
--- a/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
+++ b/tests/shell/testcases/sets/dumps/sets_with_ifnames.nft
@@ -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 {
+       }
 }