From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 2 Jul 2024 22:08:01 +0000 (+0200)
Subject: parser_bison: recursive table declaration in deprecated meter statement
X-Git-Tag: v1.1.0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a70a217079ef83482fc093d8549f8cdeaeaa3cae;p=thirdparty%2Fnftables.git

parser_bison: recursive table declaration in deprecated meter statement

This is allowing for recursive table NAME declarations such as:

 ... table xyz1 table xyz2 { ... }

remove it.

Fixes: 3ed5e31f4a32 ("src: add flow statement")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/parser_bison.y b/src/parser_bison.y
index f3f71801..6b167080 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -4212,10 +4212,11 @@ map_stmt		:	set_stmt_op	set_ref_expr '{' set_elem_expr_stmt	COLON	set_elem_expr_
 			}
 			;
 
-meter_stmt		:	flow_stmt_legacy_alloc		flow_stmt_opts	'{' meter_key_expr stmt '}'
+meter_stmt		:	flow_stmt_legacy_alloc		TABLE identifier	'{' meter_key_expr stmt '}'
 			{
-				$1->meter.key  = $4;
-				$1->meter.stmt = $5;
+				$1->meter.name = $3;
+				$1->meter.key  = $5;
+				$1->meter.stmt = $6;
 				$$->location  = @$;
 				$$ = $1;
 			}
@@ -4228,19 +4229,6 @@ flow_stmt_legacy_alloc	:	FLOW
 			}
 			;
 
-flow_stmt_opts		:	flow_stmt_opt
-			{
-				$<stmt>$	= $<stmt>0;
-			}
-			|	flow_stmt_opts		flow_stmt_opt
-			;
-
-flow_stmt_opt		:	TABLE			identifier
-			{
-				$<stmt>0->meter.name = $2;
-			}
-			;
-
 meter_stmt_alloc	:	METER	identifier		'{' meter_key_expr stmt '}'
 			{
 				$$ = meter_stmt_alloc(&@$);