evaluate: bogus datatype assertion in binary operation evaluation
Pablo Neira Ayuso
maintainerPATCH 1/2 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.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 2 +- .../shell/testcases/optimizations/dumps/not_mergeable.nft | 7 +++++++ tests/shell/testcases/optimizations/not_mergeable | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
src/evaluate.c +1 -1
@@ -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 :
tests/shell/testcases/optimizations/dumps/not_mergeable.nft +7 -0
@@ -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 } } }
tests/shell/testcases/optimizations/not_mergeable +6 -0
@@ -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 } }"
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 evaluate: datatype memleak after binop transfer
The following ruleset:
ip version vmap { 4 : jump t3, 6 : jump t4 }results in a memleak.
expr_evaluate_shift() overrides the datatype which results in a datatype memleak after the binop transfer that triggers a left-shift of the constant (in the map).
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 1 - 1 file changed, 1 deletion(-)
src/evaluate.c +0 -1
@@ -1189,7 +1189,6 @@ static int expr_evaluate_shift(struct eval_ctx *ctx, struct expr **expr)if (byteorder_conversion (ctx, &op->right,BYTEORDER_HOST_ENDIAN ) <0 )return -1 ; - op->dtype = &integer_type; op->byteorder =BYTEORDER_HOST_ENDIAN ; op->len = left->len;
Signature · 1 line
2.30.2