diff options
| author | Florian Westphal <fw@strlen.de> | 2023-12-08 19:38:33 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-12-12 15:20:58 +0100 |
| commit | 567937b5560fbcc7f6b74fb43c52e1cab2ac425a (patch) | |
| tree | d0e9098d76e2718bc8ccdd1c23140395f8f285fb /tests | |
| parent | 130060afa9f6f11e14ea5cf372545407179f16ac (diff) | |
evaluate: fix bogus assertion failure with boolean datatype
The assertion is too strict, as found by afl++:
typeof iifname . ip saddr . meta ipsec
elements = { "eth0" . 10.1.1.2 . 1 }
meta ipsec is boolean (1 bit), but datasize of 1 is set at 8 bit.
Fixes: 22b750aa6dc9 ("src: allow use of base integer types as set keys in concatenations")
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/shell/testcases/sets/dumps/typeof_sets_0.nft | 9 | ||||
| -rwxr-xr-x | tests/shell/testcases/sets/typeof_sets_0 | 17 |
2 files changed, 26 insertions, 0 deletions
diff --git a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft index 6f5b83af..63fc5b14 100644 --- a/tests/shell/testcases/sets/dumps/typeof_sets_0.nft +++ b/tests/shell/testcases/sets/dumps/typeof_sets_0.nft @@ -55,6 +55,11 @@ table inet t { elements = { 3567 . 1.2.3.4 } } + set s12 { + typeof iifname . ip saddr . meta ipsec + elements = { "eth0" . 10.1.1.2 . exists } + } + chain c1 { osf name @s1 accept } @@ -94,4 +99,8 @@ table inet t { chain c11 { vlan id . ip saddr @s11 accept } + + chain c12 { + iifname . ip saddr . meta ipsec @s12 accept + } } diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0 index 92555a1f..016227da 100755 --- a/tests/shell/testcases/sets/typeof_sets_0 +++ b/tests/shell/testcases/sets/typeof_sets_0 @@ -113,6 +113,10 @@ INPUT="table inet t {$INPUT_OSF_SET typeof vlan id . ip saddr elements = { 3567 . 1.2.3.4 } } + set s12 { + typeof meta iifname . ip saddr . meta ipsec + elements = { \"eth0\" . 10.1.1.2 . 1 } + } $INPUT_OSF_CHAIN chain c2 { ether type vlan vlan id @s2 accept @@ -138,6 +142,10 @@ $INPUT_VERSION_CHAIN chain c11 { ether type vlan vlan id . ip saddr @s11 accept } + + chain c12 { + meta iifname . ip saddr . meta ipsec @s12 accept + } }" EXPECTED="table inet t {$INPUT_OSF_SET @@ -181,6 +189,11 @@ $INPUT_VERSION_SET typeof vlan id . ip saddr elements = { 3567 . 1.2.3.4 } } + + set s12 { + typeof iifname . ip saddr . meta ipsec + elements = { \"eth0\" . 10.1.1.2 . exists } + } $INPUT_OSF_CHAIN chain c2 { vlan id @s2 accept @@ -205,6 +218,10 @@ $INPUT_SCTP_CHAIN$INPUT_VERSION_CHAIN chain c11 { vlan id . ip saddr @s11 accept } + + chain c12 { + iifname . ip saddr . meta ipsec @s12 accept + } }" |