From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH parser_bison] parser_bison: proper ct timeout list initialization
Date: Thu, 16 Apr 2020 00:01:14 +0200 [thread overview]
Message-ID: <20200415220114.585390-1-pablo@netfilter.org> (raw)
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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/parser_bison.y b/src/parser_bison.y
index 3e8d6bd6d8ca..0e04a0e4fcf0 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
--
2.11.0
reply other threads:[~2020-04-15 22:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200415220114.585390-1-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox