netfilter: nft_set_rbtree: handle element re-addition after deletion (d2df92e9) · Commits · 戴 / test

The existing code selects no next branch to be inspected when re-inserting an inactive element into the rb-tree, looping endlessly. This patch restricts the check for active elements to the EEXIST case only. Fixes: ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates") Reported-by:

Wolfgang Bumiller <w.bumiller@proxmox.com> Tested-by:

Wolfgang Bumiller <w.bumiller@proxmox.com> Signed-off-by:

Pablo Neira Ayuso <pablo@netfilter.org>

net/netfilter/nft_set_rbtree.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -116,17 +116,17 @@ static int __nft_rbtree_insert(const struct net net, const struct nft_set set,
		else if (d > 0)
		p = &parent->rb_right;
		else {
		if (nft_set_elem_active(&rbe->ext, genmask)) {
		if (nft_rbtree_interval_end(rbe) &&
		!nft_rbtree_interval_end(new))
		!nft_rbtree_interval_end(new)) {
		p = &parent->rb_left;
		else if (!nft_rbtree_interval_end(rbe) &&
		nft_rbtree_interval_end(new))
		} else if (!nft_rbtree_interval_end(rbe) &&
		nft_rbtree_interval_end(new)) {
		p = &parent->rb_right;
		else {
		} else if (nft_set_elem_active(&rbe->ext, genmask)) {
		*ext = &rbe->ext;
		return -EEXIST;
		}
		} else {
		p = &parent->rb_left;
		}
		}
		}

Admin message