diff options
| author | Florian Westphal <fw@strlen.de> | 2023-09-05 16:32:16 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-03 12:22:55 +0100 |
| commit | acf79fe3e89951c30a411ff53a4fd86c750f0c01 (patch) | |
| tree | 9375741858a29792c87676ee5fbfaa1e6eee44b0 | |
| parent | 9c352a9ef09a9b82e8549dfc6977b55a29ece0c7 (diff) | |
evaluate: fix get element for concatenated set
commit 988e83a1ce61a829473082221a790e72f8d43519 upstream.
given:
table ip filter {
set test {
type ipv4_addr . ether_addr . mark
flags interval
elements = { 198.51.100.0/25 . 00:0b:0c:ca:cc:10-c1:a0:c1:cc:10:00 . 0x0000006f, }
}
}
We get lookup failure:
nft get element ip filter test { 198.51.100.1 . 00:0b:0c:ca:cc:10 . 0x6f }
Error: Could not process rule: No such file or directory
Its possible to work around this via dummy range somewhere in the key, e.g.
nft get element ip filter test { 198.51.100.1 . 00:0b:0c:ca:cc:10 . 0x6f-0x6f }
but that shouldn't be needed, so make sure the INTERVAL flag is enabled
for the queried element if the set is of interval type.
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | src/evaluate.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index fcb77f7f..693eef33 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4266,11 +4266,14 @@ static int setelem_evaluate(struct eval_ctx *ctx, struct cmd *cmd) return -1; cmd->elem.set = set_get(set); + if (set_is_interval(ctx->set->flags)) { + if (!(set->flags & NFT_SET_CONCAT) && + interval_set_eval(ctx, ctx->set, cmd->expr) < 0) + return -1; - if (set_is_interval(ctx->set->flags) && - !(set->flags & NFT_SET_CONCAT) && - interval_set_eval(ctx, ctx->set, cmd->expr) < 0) - return -1; + assert(cmd->expr->etype == EXPR_SET); + cmd->expr->set_flags |= NFT_SET_INTERVAL; + } ctx->set = NULL; |