From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nft 3/3] src: evaluate: return immediately if no op was requested
Date: Sun, 21 Jul 2019 20:49:01 +0200 [thread overview]
Message-ID: <20190721184901.n5ea7kpn246bddnb@salvia> (raw)
In-Reply-To: <20190721001406.23785-4-fw@strlen.de>
On Sun, Jul 21, 2019 at 02:14:07AM +0200, Florian Westphal wrote:
> This makes nft behave like 0.9.0 -- the ruleset
>
> flush ruleset
> table inet filter {
> }
> table inet filter {
> chain test {
> counter
> }
> }
>
> loads again without generating an error message.
> I've added a test case for this, without this it will create an error,
> and with a checkout of the 'fixes' tag we get crash.
>
> Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1351
> Fixes: e5382c0d08e3c ("src: Support intra-transaction rule references")
This one is causing the cache corruption, right?
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> src/evaluate.c | 3 +++
> tests/shell/testcases/cache/0003_cache_update_0 | 12 ++++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/src/evaluate.c b/src/evaluate.c
> index b56932ccabcc..8c1c82abed4e 100644
> --- a/src/evaluate.c
> +++ b/src/evaluate.c
> @@ -3258,6 +3258,9 @@ static int rule_cache_update(struct eval_ctx *ctx, enum cmd_ops op)
> struct table *table;
> struct chain *chain;
>
> + if (op == CMD_INVALID)
> + return 0;
> +
> table = table_lookup(&rule->handle, &ctx->nft->cache);
> if (!table)
> return table_not_found(ctx);
> diff --git a/tests/shell/testcases/cache/0003_cache_update_0 b/tests/shell/testcases/cache/0003_cache_update_0
> index 05edc9c7c33e..fb4b0e24c790 100755
> --- a/tests/shell/testcases/cache/0003_cache_update_0
> +++ b/tests/shell/testcases/cache/0003_cache_update_0
> @@ -48,3 +48,15 @@ $NFT -f - >/dev/null <<EOF
> add rule ip t4 c meta l4proto igmp accept
> add rule ip t4 c index 2 drop
> EOF
> +
> +# Trigger a crash or rule restore error with nft 0.9.1
> +$NFT -f - >/dev/null <<EOF
> +flush ruleset
> +table inet testfilter {
> +}
> +table inet testfilter {
> + chain test {
> + counter
> + }
> +}
> +EOF
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-07-21 18:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 0:14 [PATCH nft 0/3] fix crash bug during rule restore Florian Westphal
2019-07-21 0:14 ` [PATCH nft 1/3] src: erec: fall back to internal location if its null Florian Westphal
2019-07-21 18:46 ` Pablo Neira Ayuso
2019-07-21 18:50 ` Florian Westphal
2019-07-23 19:19 ` Pablo Neira Ayuso
2019-07-21 0:14 ` [PATCH nft 2/3] src: evaluate: don't rely on global chain ctx for error reporting Florian Westphal
2019-07-21 0:14 ` [PATCH nft 3/3] src: evaluate: return immediately if no op was requested Florian Westphal
2019-07-21 18:49 ` Pablo Neira Ayuso [this message]
2019-07-21 18:50 ` Florian Westphal
2019-07-22 21:25 ` Pablo Neira Ayuso
2019-07-23 13:11 ` Phil Sutter
2019-07-23 13:52 ` Pablo Neira Ayuso
2019-07-23 19:18 ` Pablo Neira Ayuso
2019-07-23 22:44 ` Florian Westphal
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=20190721184901.n5ea7kpn246bddnb@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--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;
as well as URLs for NNTP newsgroup(s).