From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 15 Apr 2020 21:58:57 +0000 (+0200)
Subject: parser_bison: proper ct timeout list initialization
X-Git-Tag: v0.9.5~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=935a28529ba8223742db790b10300bfdeb6c256d;p=thirdparty%2Fnftables.git

parser_bison: proper ct timeout list initialization

Initialize list of timeout policies from ct_timeout_block.

Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1403
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 3e8d6bd6..0e04a0e4 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -1992,7 +1992,11 @@ ct_helper_block		:	/* empty */	{ $$ = $<obj>-1; }
 			}
 			;
 
-ct_timeout_block	:	/*empty */	{ $$ = $<obj>-1; }
+ct_timeout_block	:	/*empty */
+			{
+				$$ = $<obj>-1;
+				init_list_head(&$$->ct_timeout.timeout_list);
+			}
 			|	ct_timeout_block     common_block
 			|	ct_timeout_block     stmt_separator
 			|	ct_timeout_block     ct_timeout_config
@@ -3896,7 +3900,6 @@ ct_timeout_config	:	PROTOCOL	ct_l4protoname	stmt_separator
 				struct ct_timeout *ct;
 
 				ct = &$<obj>0->ct_timeout;
-				init_list_head(&ct->timeout_list);
 				list_splice_tail($4, &ct->timeout_list);
 			}
 			|	L3PROTOCOL	family_spec_explicit	stmt_separator