From: Florian Westphal Date: Wed, 13 Dec 2023 16:29:50 +0000 (+0100) Subject: evaluate: error out when existing set has incompatible key X-Git-Tag: v1.1.0~158 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c0194279d356f942e81555262e41264af7659a1f;p=thirdparty%2Fnftables.git evaluate: error out when existing set has incompatible key Before: BUG: invalid range expression type symbol nft: expression.c:1494: range_expr_value_high: Assertion `0' failed. After: range_expr_value_high_assert:5:20-27: Error: Could not resolve protocol name elements = { 100-11.0.0.0, } ^^^^^^^^ range_expr_value_high_assert:7:6-7: Error: set definition has conflicting key (ipv4_addr vs inet_proto) Signed-off-by: Florian Westphal --- diff --git a/src/evaluate.c b/src/evaluate.c index da382912..8173d153 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4761,6 +4761,9 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) existing_set = set_cache_find(table, set->handle.set.name); if (!existing_set) set_cache_add(set_get(set), table); + else if (!datatype_equal(existing_set->key->dtype, set->key->dtype)) + return set_error(ctx, set, "%s definition has conflicting key (%s vs %s)\n", + type, set->key->dtype->name, existing_set->key->dtype->name); if (existing_set && existing_set->flags & NFT_SET_EVAL) { uint32_t existing_flags = existing_set->flags & ~NFT_SET_EVAL; diff --git a/tests/shell/testcases/bogons/nft-f/range_expr_value_high_assert b/tests/shell/testcases/bogons/nft-f/range_expr_value_high_assert new file mode 100644 index 00000000..a25ac028 --- /dev/null +++ b/tests/shell/testcases/bogons/nft-f/range_expr_value_high_assert @@ -0,0 +1,12 @@ +table inet t { + set s3 { + type inet_proto + flags interval + elements = { 100-11.0.0.0, } + } + set s3 { + type ipv4_addr + flags interval + elements = { 100-11.0.0.0, } + } +}