Included bogon asserts with:
BUG: unhandled key type 13
nft: src/intervals.c:73: setelem_expr_to_range: Assertion `0' failed.
This should be rejected at parser stage, but the check for udata
support was only done on the first item in a concatenation.
After fix, parser rejects this with:
Error: primary expression type 'symbol' lacks typeof serialization
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
src/parser_bison.y | 14 ++++++++++----
.../nft-f/typeof_map_with_plain_integer_assert | 7 +++++++
2 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 tests/shell/testcases/bogons/nft-f/typeof_map_with_plain_integer_assert
diff --git a/src/parser_bison.y b/src/parser_bison.y
index 4d4d39342bf7..cc3c908593a0 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -816,8 +816,8 @@ int nft_lex(void *, void *, void *);
%type <expr> symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
%destructor { expr_free($$); } symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr
-%type <expr> primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr
-%destructor { expr_free($$); } primary_expr shift_expr and_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr
+%type <expr> primary_expr shift_expr and_expr primary_typeof_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr
+%destructor { expr_free($$); } primary_expr shift_expr and_expr primary_typeof_expr typeof_expr typeof_data_expr typeof_key_expr typeof_verdict_expr
%type <expr> exclusive_or_expr inclusive_or_expr
%destructor { expr_free($$); } exclusive_or_expr inclusive_or_expr
%type <expr> basic_expr
@@ -2142,7 +2142,7 @@ typeof_data_expr : INTERVAL typeof_expr
}
;
-typeof_expr : primary_expr
+primary_typeof_expr : primary_expr
{
if (expr_ops($1)->build_udata == NULL) {
erec_queue(error(&@1, "primary expression type '%s' lacks typeof serialization", expr_ops($1)->name),
@@ -2153,7 +2153,13 @@ typeof_expr : primary_expr
$$ = $1;
}
- | typeof_expr DOT primary_expr
+ ;
+
+typeof_expr : primary_typeof_expr
+ {
+ $$ = $1;
+ }
+ | typeof_expr DOT primary_typeof_expr
{
struct location rhs[] = {
[1] = @2,
diff --git a/tests/shell/testcases/bogons/nft-f/typeof_map_with_plain_integer_assert b/tests/shell/testcases/bogons/nft-f/typeof_map_with_plain_integer_assert
new file mode 100644
index 000000000000..f1dc12f699ec
--- /dev/null
+++ b/tests/shell/testcases/bogons/nft-f/typeof_map_with_plain_integer_assert
@@ -0,0 +1,7 @@
+table ip t {
+ map m {
+ typeof ip saddr . meta mark . 0: verdict
+ flags interval
+ elements = { 127.0.0.1-127.0.0.4 . 0x00123434-0x00b00122 : accept }
+ }
+}
--
2.48.1
