diff options
author | Florian Westphal <fw@strlen.de> | 2023-12-13 17:00:37 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2023-12-13 17:28:08 +0100 |
commit | 3eb0a73a9ee32897290d4097c0ec29377e25859e (patch) | |
tree | c1c98dcbcdc9ed3df5b1809d4db098476597c4c9 | |
parent | d755c2a3ae7fe8272321a1d81eafbd90052c4f14 (diff) |
evaluate: stmt_nat: set reference must point to a map
nat_concat_map() requires a datamap, else we crash:
set->data is dereferenced.
Also update expr_evaluate_map() so that EXPR_SET_REF is checked there
too.
Signed-off-by: Florian Westphal <fw@strlen.de>
-rw-r--r-- | src/evaluate.c | 9 | ||||
-rw-r--r-- | tests/shell/testcases/bogons/nft-f/nat_stmt_with_set_instead_of_map | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 1b3e8097..da382912 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2041,6 +2041,9 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) break; case EXPR_SET_REF: /* symbol has been already evaluated to set reference */ + if (!set_is_map(mappings->set->flags)) + return expr_error(ctx->msgs, map->mappings, + "Expression is not a map"); break; default: return expr_binary_error(ctx->msgs, map->mappings, map->map, @@ -3969,6 +3972,12 @@ static bool nat_concat_map(struct eval_ctx *ctx, struct stmt *stmt) if (expr_evaluate(ctx, &stmt->nat.addr->mappings)) return false; + if (!set_is_datamap(stmt->nat.addr->mappings->set->flags)) { + expr_error(ctx->msgs, stmt->nat.addr->mappings, + "Expression is not a map"); + return false; + } + if (stmt->nat.addr->mappings->set->data->etype == EXPR_CONCAT || stmt->nat.addr->mappings->set->data->dtype->subtypes) { stmt->nat.type_flags |= STMT_NAT_F_CONCAT; diff --git a/tests/shell/testcases/bogons/nft-f/nat_stmt_with_set_instead_of_map b/tests/shell/testcases/bogons/nft-f/nat_stmt_with_set_instead_of_map new file mode 100644 index 00000000..b1302278 --- /dev/null +++ b/tests/shell/testcases/bogons/nft-f/nat_stmt_with_set_instead_of_map @@ -0,0 +1,10 @@ +table inet x { + set y { + type ipv4_addr + elements = { 2.2.2.2, 3.3.3.3 } + } + + chain y { + snat ip to ip saddr map @y + } +} |