From 334f161f67144d54e0bbe11a5b5352a6270d9113 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:32 +0100 Subject: [PATCH] Revert "netfilter: nf_tables: missing iterator type in lookup walk" This reverts commit 7d63704581daf09fa2d6ac5981b2df0734f3f5da. --- net/netfilter/nft_lookup.c | 1 - net/netfilter/nft_set_pipapo.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c index f6ea1b32d..d2f8131ed 100755 --- a/net/netfilter/nft_lookup.c +++ b/net/netfilter/nft_lookup.c @@ -207,7 +207,6 @@ 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 ce617f6a2..b30be099f 100755 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -2030,8 +2030,7 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, struct nft_pipapo_field *f; int i, r; - WARN_ON_ONCE(iter->type != NFT_ITER_READ && - iter->type != NFT_ITER_UPDATE); + WARN_ON_ONCE(iter->type == NFT_ITER_UNSPEC); rcu_read_lock(); if (iter->type == NFT_ITER_READ)