diff options
| author | Florian Westphal <fw@strlen.de> | 2025-03-20 14:33:05 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-07-27 20:27:31 +0200 |
| commit | 290bf33b1112fc03e8a87a7766d2de077806eb40 (patch) | |
| tree | ee2c7b5c9f53dc1e585053a5909597cd82a46190 | |
| parent | 34bbb7d0938329c15142ce9e0e3561648dd708b5 (diff) | |
evaluate: fix assertion failure with malformed map definitions
commit 7fa22984d7841a0feeaaeb0c2ed5d3cb637097e0 upstream.
Included bogon triggers:
nft: src/evaluate.c:2267: expr_evaluate_mapping: Assertion `set->data != NULL' failed.
After this fix, following errors will be shown:
Error: unqualified type invalid specified in map definition. Try "typeof expression" instead of "type datatype".
map m {
^
map m {
^
Error: map has no mapping data
Fixes: 343a51702656 ("src: store expr, not dtype to track data in sets")
Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 5 | ||||
| -rw-r--r-- | tests/shell/testcases/bogons/nft-f/malformed_map_expr_evaluate_mapping_assert | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 3b760919..3724a2bd 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2163,7 +2163,10 @@ static int expr_evaluate_mapping(struct eval_ctx *ctx, struct expr **expr) "Key must be a constant"); mapping->flags |= mapping->left->flags & EXPR_F_SINGLETON; - assert(set->data != NULL); + /* This can happen for malformed map definitions */ + if (!set->data) + return set_error(ctx, set, "map has no mapping data"); + if (!set_is_anonymous(set->flags) && set->data->flags & EXPR_F_INTERVAL) datalen = set->data->len / 2; diff --git a/tests/shell/testcases/bogons/nft-f/malformed_map_expr_evaluate_mapping_assert b/tests/shell/testcases/bogons/nft-f/malformed_map_expr_evaluate_mapping_assert new file mode 100644 index 00000000..c77a9c33 --- /dev/null +++ b/tests/shell/testcases/bogons/nft-f/malformed_map_expr_evaluate_mapping_assert @@ -0,0 +1,6 @@ +table ip x { + map m { + typeof ct saddr :ct expectation + elements = { * : none} + } +} |