]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
parser_bison: proper ct timeout list initialization
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 15 Apr 2020 21:58:57 +0000 (23:58 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 15 Apr 2020 22:00:12 +0000 (00:00 +0200)
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>
src/parser_bison.y

index 3e8d6bd6d8ca32c194f4fde5a086bd079c8fcd06..0e04a0e4fcf04d9563c83ae8e6c122f962768318 100644 (file)
@@ -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