memleak fixes for tests/shell/testcases/bogons/nft-f/
Pablo Neira Ayuso
maintainercover memleak fixes for tests/shell/testcases/bogons/nft-f/
Hi!
I found these when running:
ls * | while read line; do sudo nft -f $line; done
from the tests/shell/testcases/bogons/nft-f/, for some reason the bogons test does not bail out when ASAN reports an issue, while it reports [FAILED] in other existing tests on memleaks.
Pablo Neira Ayuso (2):
evaluate: release key expression in error path of implicit map with unknown datatype
evaluate: release mpz type in expr_evaluate_list() error path
src/evaluate.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: release key expression in error path of implicit map with unknown datatype
Detected when running:
# nft -f tests/shell/testcases/bogons/nft-f/mapping_with_invalid_datatype_crash ==382584==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 144 byte(s) in 1 object(s) allocated from:
#0 0x7fde06ca9e8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
#1 0x7fde062924af in xmalloc src/utils.c:31
#2 0x7fde0629266c in xzalloc src/utils.c:70
#3 0x7fde06167299 in expr_alloc src/expression.c:46
#4 0x7fde0616b014 in constant_expr_alloc src/expression.c:420
#5 0x7fde06128e43 in expr_evaluate_map src/evaluate.c:2027
#6 0x7fde06137b06 in expr_evaluate src/evaluate.c:2891
#7 0x7fde06132417 in expr_evaluate_relational src/evaluate.c:2497
#8 0x7fde06137b36 in expr_evaluate src/evaluate.c:2895
#9 0x7fde06137d5f in stmt_evaluate_expr src/evaluate.c:2914
#10 0x7fde061524c8 in stmt_evaluate src/evaluate.c:4646
#11 0x7fde0615c9ee in rule_evaluate src/evaluate.c:5202
#12 0x7fde061600c7 in cmd_evaluate_add src/evaluate.c:5422--- src/evaluate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
src/evaluate.c +3 -1
@@ -2030,9 +2030,11 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) ctx->ectx.len, NULL); } -if (!ectx.dtype) +if (!ectx.dtype) { +expr_free (key);return expr_error (ctx->msgs, map,"Implicit map expression without known datatype" ); + }if (ectx.dtype->type ==TYPE_VERDICT ) { data =verdict_expr_alloc (&netlink_location,0 ,NULL );
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 evaluate: release mpz type in expr_evaluate_list() error path
In reply to Pablo Neira AyusoDetected when running:
# nft -f tests/shell/testcases/bogons/nft-f/no_integer_basetype_crash ==383222==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 8 byte(s) in 1 object(s) allocated from:
#0 0x7fe7b54a9e8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
#1 0x7fe7b538b9a9 in __gmp_default_allocate (/lib/x86_64-linux-gnu/libgmp.so.10+0xc9a9)---
I picked a recent Fixes: tag, this error path memleak is rather old.
src/evaluate.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
src/evaluate.c +9 -3
@@ -1668,16 +1668,22 @@ static int expr_evaluate_list(struct eval_ctx *ctx, struct expr **expr)mpz_init_set_ui (val,0 );list_for_each_entry_safe (i, next, &list->expressions, list) { -if (list_member_evaluate (ctx, &i) <0 ) +if (list_member_evaluate (ctx, &i) <0 ) { +mpz_clear (val);return -1 ; -if (i->etype !=EXPR_VALUE ) + } +if (i->etype !=EXPR_VALUE ) { +mpz_clear (val);return expr_error (ctx->msgs, i,"List member must be a constant " "value" ); -if (datatype_basetype (i->dtype)->type !=TYPE_BITMASK ) + } +if (datatype_basetype (i->dtype)->type !=TYPE_BITMASK ) { +mpz_clear (val);return expr_error (ctx->msgs, i,"Basetype of type %s is not bitmask" , i->dtype->desc); + }mpz_ior (val, val, i->value); }
Signature · 1 line
2.30.2