Commit 2b84e215 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nft_set_pipapo: .walk does not deal with generations 



The .walk callback iterates over the current active set, but it might be
useful to iterate over the next generation set. Use the generation mask
to determine what set view (either current or next generation) is use
for the walk iteration.

Fixes: 3c4287f6 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 628bd3e4

net/netfilter/nft_set_pipapo.c

+5 −1
Original line number Diff line number Diff line
@@ -1974,12 +1974,16 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, 
			    struct nft_set_iter *iter)

{

	struct nft_pipapo *priv = nft_set_priv(set);

	struct net *net = read_pnet(&set->net);

	struct nft_pipapo_match *m;

	struct nft_pipapo_field *f;

	int i, r;



	rcu_read_lock();

	if (iter->genmask == nft_genmask_cur(net))

		m = rcu_dereference(priv->match);

	else

		m = priv->clone;



	if (unlikely(!m))

		goto out;