expression: define .clone for catchall set element
Pablo Neira Ayuso
maintainerPATCH 1/1 expression: define .clone for catchall set element
Otherwise reuse of catchall set element expression in variable triggers a null-pointer dereference.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/expression.c | 15 +++++++++++-- .../shell/testcases/maps/0017_map_variable_0 | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 tests/shell/testcases/maps/0017_map_variable_0
src/expression.c +13 -2
@@ -1342,9 +1342,8 @@ static void set_elem_expr_destroy(struct expr *expr)stmt_free (stmt); } -static void set_elem_expr_clone (struct expr *new,const struct expr *expr) +static void __set_elem_expr_clone (struct expr *new,const struct expr *expr) { - new->key =expr_clone (expr->key); new->expiration = expr->expiration; new->timeout = expr->timeout;if (expr->comment)
@@ -1352,6 +1351,12 @@ static void set_elem_expr_clone(struct expr *new, const struct expr *expr)init_list_head (&new->stmt_list); } +static void set_elem_expr_clone (struct expr *new,const struct expr *expr) +{ + new->key =expr_clone (expr->key); +__set_elem_expr_clone (new, expr); +} +static const struct expr_ops set_elem_expr_ops = { .type =EXPR_SET_ELEM , .name ="set element" ,
@@ -1379,11 +1384,17 @@ static void set_elem_catchall_expr_print(const struct expr *expr,nft_print (octx,"*" ); } +static void set_elem_catchall_expr_clone (struct expr *new,const struct expr *expr) +{ +__set_elem_expr_clone (new, expr); +} +static const struct expr_ops set_elem_catchall_expr_ops = { .type =EXPR_SET_ELEM_CATCHALL , .name ="catch-all set element" , .print = set_elem_catchall_expr_print, .json = set_elem_catchall_expr_json, + .clone = set_elem_catchall_expr_clone, };struct expr *set_elem_catchall_expr_alloc (const struct location *loc)
tests/shell/testcases/maps/0017_map_variable_0 new file +21 -0
@@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +RULESET="define x = { + 1.1.1.1 : 2, + * : 3, +} + +table ip x { + map y { + typeof ip saddr : mark + elements = \$x + } + map z { + typeof ip saddr : mark + elements = \$x + } +}" + +$NFT -f - <<< "$RULESET"
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/1 tests: shell: refcount memleak in map rhs with timeouts
Extend coverage for refcount leaks on map element expiration.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- .../testcases/maps/0018map_leak_timeout_0 | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 tests/shell/testcases/maps/0018map_leak_timeout_0
tests/shell/testcases/maps/0018map_leak_timeout_0 new file +48 -0
@@ -0,0 +1,48 @@ +#!/bin/bash + +set -e + +RULESET="table ip t { + map sourcemap { + type ipv4_addr : verdict + timeout 3s + elements = { 100.123.10.2 : jump c } + } + + chain c { + } +}" + +$NFT -f - <<< "$RULESET" +# again, since it is addition, not creation, it is successful +$NFT -f - <<< "$RULESET" + +# wait for elements to expire +sleep 5 + +# flush it to check for refcount leak +$NFT flush ruleset + +# +# again with stateful objects +# + +RULESET="table ip t { + counter c {} + + map sourcemap { + type ipv4_addr : counter + timeout 3s + elements = { 100.123.10.2 : \"c\" } + } +}" + +$NFT -f - <<< "$RULESET" +# again, since it is addition, not creation, it is successful +$NFT -f - <<< "$RULESET" +# flush it to check for refcount leak + +# wait for elements to expire +sleep 5 + +$NFT flush ruleset
Signature · 1 line
2.30.2