| Message ID | 20240418010948.3332346-2-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [net,1/3] netfilter: nf_tables: missing iterator type in lookup walk | expand |
Hello: This series was applied to netdev/net.git (main) by Pablo Neira Ayuso <pablo@netfilter.org>: On Thu, 18 Apr 2024 03:09:46 +0200 you wrote: > 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> > --- > net/netfilter/nft_lookup.c | 1 + > net/netfilter/nft_set_pipapo.c | 3 ++- > 2 files changed, 3 insertions(+), 1 deletion(-) Here is the summary with links: - [net,1/3] netfilter: nf_tables: missing iterator type in lookup walk https://git.kernel.org/netdev/net/c/efefd4f00c96 - [net,2/3] netfilter: nf_tables: restore set elements when delete set fails https://git.kernel.org/netdev/net/c/e79b47a8615d - [net,3/3] netfilter: nf_tables: fix memleak in map from abort path https://git.kernel.org/netdev/net/c/86a1471d7cde You are awesome, thank you!
diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index a0055f510e31..b314ca728a29 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 eeaf05ffba95..0f903d18bbea 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -2123,7 +2123,8 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, const struct nft_pipapo_field *f; unsigned 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)
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> --- net/netfilter/nft_lookup.c | 1 + net/netfilter/nft_set_pipapo.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)