diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2024-04-17 18:43:01 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-27 18:12:52 +0300 |
commit | 0549dec3d149e28e82a30bbafe6616789bc6cdd7 (patch) | |
tree | 00c9ad8acd60614fd3b1b04f1fed61017154e8da /net | |
parent | f3e23edc4917f72139b805f208aeadf23376a0b5 (diff) | |
download | linux-0549dec3d149e28e82a30bbafe6616789bc6cdd7.tar.xz |
netfilter: nf_tables: missing iterator type in lookup walk
[ Upstream commit efefd4f00c967d00ad7abe092554ffbb70c1a793 ]
Add missing decorator type to lookup expression and tighten WARN_ON_ONCE
check in pipapo to spot earlier that this is unset.
Fixes: 29b359cf6d95 ("netfilter: nft_set_pipapo: walk over current view on netlink dump")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nft_lookup.c | 1 | ||||
-rw-r--r-- | net/netfilter/nft_set_pipapo.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index 870e5b113d13..87c18eddb068 100644 --- a/net/netfilter/nft_lookup.c +++ b/net/netfilter/nft_lookup.c @@ -216,6 +216,7 @@ static int nft_lookup_validate(const struct nft_ctx *ctx, return 0; iter.genmask = nft_genmask_next(ctx->net); + iter.type = NFT_ITER_UPDATE; iter.skip = 0; iter.count = 0; iter.err = 0; diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 979b5e80c400..c91efad49c6d 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -2048,7 +2048,8 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, const struct nft_pipapo_field *f; int i, r; - WARN_ON_ONCE(iter->type == NFT_ITER_UNSPEC); + WARN_ON_ONCE(iter->type != NFT_ITER_READ && + iter->type != NFT_ITER_UPDATE); rcu_read_lock(); if (iter->type == NFT_ITER_READ) |