Commit 340fa344 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Wen Zhiwei
Browse files

netfilter: nf_tables: missing iterator type in lookup walk 

stable inclusion
from stable-v6.6.53
commit 424bd79517ce08f72ffb3b45aee738920f161d3b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=424bd79517ce08f72ffb3b45aee738920f161d3b



--------------------------------

commit efefd4f00c967d00ad7abe092554ffbb70c1a793 upstream.

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 15a580cf

net/netfilter/nft_lookup.c

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,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;

net/netfilter/nft_set_pipapo.c

+2 −1
Original line number Diff line number Diff line
@@ -2041,7 +2041,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)