parser_bison: reject non-serializeable typeof expressions

commit a1bb1814148c5011d50cb566a92b3b30fff118b0 upstream.

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

Fixes: 6e48df5329ea ("src: add "typeof" build/parse/print support")
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 30a4c1ed5b2f8c3a9a89e0f5ef58ad95e0efacbd..67ac8f57ae395ee8784263b386351943bffd8753 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -798,8 +798,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
@@ -1999,7 +1999,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),
@@ -2010,7 +2010,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 (file)
index 0000000..f1dc12f
--- /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 }
+        }
+}