Commit 60c0c230 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nft_set_rbtree: skip end interval element from gc 



rbtree lazy gc on insert might collect an end interval element that has
been just added in this transactions, skip end interval elements that
are not yet active.

Fixes: f718863a ("netfilter: nft_set_rbtree: fix overlap expiration walk")
Cc: stable@vger.kernel.org
Reported-by: default avatarlonial con <kongln9170@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f82777e8

net/netfilter/nft_set_rbtree.c

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void nft_rbtree_gc_elem_remove(struct net *net, struct nft_set *set, 


static const struct nft_rbtree_elem *

nft_rbtree_gc_elem(const struct nft_set *__set, struct nft_rbtree *priv,

		   struct nft_rbtree_elem *rbe, u8 genmask)

		   struct nft_rbtree_elem *rbe)

{

	struct nft_set *set = (struct nft_set *)__set;

	struct rb_node *prev = rb_prev(&rbe->node);
@@ -253,7 +253,7 @@ nft_rbtree_gc_elem(const struct nft_set *__set, struct nft_rbtree *priv, 
	while (prev) {

		rbe_prev = rb_entry(prev, struct nft_rbtree_elem, node);

		if (nft_rbtree_interval_end(rbe_prev) &&

		    nft_set_elem_active(&rbe_prev->ext, genmask))

		    nft_set_elem_active(&rbe_prev->ext, NFT_GENMASK_ANY))

			break;



		prev = rb_prev(prev);
@@ -365,7 +365,7 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, 
		    nft_set_elem_active(&rbe->ext, cur_genmask)) {

			const struct nft_rbtree_elem *removed_end;



			removed_end = nft_rbtree_gc_elem(set, priv, rbe, genmask);

			removed_end = nft_rbtree_gc_elem(set, priv, rbe);

			if (IS_ERR(removed_end))

				return PTR_ERR(removed_end);