diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-06-30 09:42:11 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-06-30 09:43:24 +0200 |
commit | 5bd6b4981ce649b5e0ae5ec30b7738ef33ef7c6e (patch) | |
tree | 6791535a71db273cf26dfcae907f36acd5a17d3b | |
parent | 50bebfaf9d558d539f06c0710781a49e8b58f25f (diff) |
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 <pablo@netfilter.org>
-rw-r--r-- | src/expression.c | 15 | ||||
-rwxr-xr-x | tests/shell/testcases/maps/0017_map_variable_0 | 21 |
2 files changed, 34 insertions, 2 deletions
diff --git a/src/expression.c b/src/expression.c index 9b53f43b..34902c84 100644 --- a/src/expression.c +++ b/src/expression.c @@ -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) diff --git a/tests/shell/testcases/maps/0017_map_variable_0 b/tests/shell/testcases/maps/0017_map_variable_0 new file mode 100755 index 00000000..70cea88d --- /dev/null +++ b/tests/shell/testcases/maps/0017_map_variable_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" |