diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-10-05 01:36:44 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-10-06 15:35:23 +0200 |
| commit | 77bd7e0c70d9a1914c4a853e09849af724c0f695 (patch) | |
| tree | de11f92ef0d561bfac6d479a0712c9be8aa17b7a | |
| parent | 545edb7a8ef0a8acf991b1b7857fddc24d7b151a (diff) | |
evaluate: bogus datatype assertion in binary operation evaluation
Use datatype_equal(), otherwise dynamically allocated datatype fails
to fulfill the datatype pointer check, triggering the assertion:
nft: evaluate.c:1249: expr_evaluate_binop: Assertion `expr_basetype(left) == expr_basetype(right)' failed.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1636
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 2 | ||||
| -rw-r--r-- | tests/shell/testcases/optimizations/dumps/not_mergeable.nft | 7 | ||||
| -rwxr-xr-x | tests/shell/testcases/optimizations/not_mergeable | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index a52867b3..2e2b8df0 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1265,7 +1265,7 @@ static int expr_evaluate_binop(struct eval_ctx *ctx, struct expr **expr) sym, expr_name(right)); /* The grammar guarantees this */ - assert(expr_basetype(left) == expr_basetype(right)); + assert(datatype_equal(expr_basetype(left), expr_basetype(right))); switch (op->op) { case OP_LSHIFT: diff --git a/tests/shell/testcases/optimizations/dumps/not_mergeable.nft b/tests/shell/testcases/optimizations/dumps/not_mergeable.nft index 08b2b58f..02b89207 100644 --- a/tests/shell/testcases/optimizations/dumps/not_mergeable.nft +++ b/tests/shell/testcases/optimizations/dumps/not_mergeable.nft @@ -5,8 +5,15 @@ table ip x { chain t2 { } + chain t3 { + } + + chain t4 { + } + chain y { counter packets 0 bytes 0 jump t1 counter packets 0 bytes 0 jump t2 + ip version vmap { 4 : jump t3, 6 : jump t4 } } } diff --git a/tests/shell/testcases/optimizations/not_mergeable b/tests/shell/testcases/optimizations/not_mergeable index 25635cdd..ddb2f0fd 100755 --- a/tests/shell/testcases/optimizations/not_mergeable +++ b/tests/shell/testcases/optimizations/not_mergeable @@ -7,9 +7,15 @@ RULESET="table ip x { } chain t2 { } + chain t3 { + } + chain t4 { + } chain y { counter jump t1 counter jump t2 + ip version 4 jump t3 + ip version 6 jump t4 } }" |