netfilter: nft_lookup: fix catchall element handling with inverted lookups
Subsystems (2)
PATCH 1/1 netfilter: nft_lookup: fix catchall element handling with inverted lookups
nft_lookup_eval() decides whether a lookup matched (found) from the direct set lookup and priv->invert before falling back to the catchall element used by interval sets (e.g. nft_set_rbtree) for the open-ended default range. Since found is never recomputed after ext is replaced by the catchall lookup, inverted lookups (NFT_LOOKUP_F_INV, "!= @set") can wrongly match or wrongly skip the catchall element, producing the wrong verdict. Fold the catchall lookup into ext before computing found, matching the order already used by nft_objref_map_eval().
Signed-off-by Tamaki Yanagawa <[email protected]>
Assisted-by Claude:claude-sonnet-5
--- net/netfilter/nft_lookup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/nft_lookup.c +5 -5
@@ -103,13 +103,13 @@ void nft_lookup_eval(const struct nft_expr *expr,bool found; ext =nft_set_do_lookup (net, set, ®s->data[priv->sreg]); +if (!ext) + ext =nft_set_catchall_lookup (net, set); + found = !!ext ^ priv->invert;if (!found) { - ext =nft_set_catchall_lookup (net, set); -if (!ext) { - regs->verdict.code =NFT_BREAK ; -return ; - } + regs->verdict.code =NFT_BREAK ; +return ; }if (ext) {
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
Signature · 1 line
2.52.0.windows.1