netfilter: nft_set_rbtree: check for inactive element after flag mismatch (05b7639d) · Commits · 戴 / test

Otherwise, we hit bogus ENOENT when removing elements. Fixes: ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates") Reported-by:

net/netfilter/nft_set_rbtree.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -308,10 +308,6 @@ static void nft_rbtree_deactivate(const struct net net,
		else if (d > 0)
		parent = parent->rb_right;
		else {
		if (!nft_set_elem_active(&rbe->ext, genmask)) {
		parent = parent->rb_left;
		continue;
		}
		if (nft_rbtree_interval_end(rbe) &&
		!nft_rbtree_interval_end(this)) {
		parent = parent->rb_left;
		@@ -320,6 +316,9 @@ static void nft_rbtree_deactivate(const struct net net,
		nft_rbtree_interval_end(this)) {
		parent = parent->rb_right;
		continue;
		} else if (!nft_set_elem_active(&rbe->ext, genmask)) {
		parent = parent->rb_left;
		continue;
		}
		nft_rbtree_flush(net, set, rbe);
		return rbe;