Unverified Commit b687cb24 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3621 netfilter: nft_set_pipapo: skip inactive elements during set walk 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TMQO4MPNJXWQ3W7VLINKLYTGDGJ2I4DP/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8PGNK 
 
Link:https://gitee.com/openeuler/kernel/pulls/3621

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3df64000 204c0484

net/netfilter/nft_set_pipapo.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1979,6 +1979,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, 
		if (nft_set_elem_expired(&e->ext))

		if (nft_set_elem_expired(&e->ext))

			goto cont;

			goto cont;





		if (!nft_set_elem_active(&e->ext, iter->genmask))

			goto cont;



		elem.priv = e;

		elem.priv = e;





		iter->err = iter->fn(ctx, set, iter, &elem);

		iter->err = iter->fn(ctx, set, iter, &elem);