From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft 1/2] optimize: more robust statement merge with vmap
Date: Thu, 3 Mar 2022 13:15:05 +0100 [thread overview]
Message-ID: <20220303121506.496055-1-pablo@netfilter.org> (raw)
Check expressions that are expected on the rhs rather than using a
catch-all default case.
Fixes: 1542082e259b ("optimize: merge same selector with different verdict into verdict map")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/optimize.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/optimize.c b/src/optimize.c
index 64c0a4dbe764..9c63f6a98e95 100644
--- a/src/optimize.c
+++ b/src/optimize.c
@@ -445,12 +445,17 @@ static void build_verdict_map(struct expr *expr, struct stmt *verdict, struct ex
compound_expr_add(set, mapping);
}
break;
- default:
+ case EXPR_VALUE:
+ case EXPR_PREFIX:
+ case EXPR_RANGE:
elem = set_elem_expr_alloc(&internal_location, expr_get(expr));
mapping = mapping_expr_alloc(&internal_location, elem,
expr_get(verdict->expr));
compound_expr_add(set, mapping);
break;
+ default:
+ assert(0);
+ break;
}
}
--
2.30.2
next reply other threads:[~2022-03-03 12:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 12:15 Pablo Neira Ayuso [this message]
2022-03-03 12:15 ` [PATCH nft 2/2] optimize: incorrect assert() for unexpected expression type Pablo Neira Ayuso
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=20220303121506.496055-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;
as well as URLs for NNTP newsgroup(s).