* [PATCH nf] netfilter: nft_set_rbtree: handle re-addition element after deletion
@ 2017-05-21 22:17 Pablo Neira Ayuso
2017-05-22 6:52 ` Wolfgang Bumiller
0 siblings, 1 reply; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-21 22:17 UTC (permalink / raw)
To: netfilter-devel; +Cc: w.bumiller
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: e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates")
Reported-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_set_rbtree.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index e97e2fb53f0a..fbdbaa00dd5f 100644
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -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))
- p = &parent->rb_left;
- else if (!nft_rbtree_interval_end(rbe) &&
- nft_rbtree_interval_end(new))
- p = &parent->rb_right;
- else {
- *ext = &rbe->ext;
- return -EEXIST;
- }
+ if (nft_rbtree_interval_end(rbe) &&
+ !nft_rbtree_interval_end(new)) {
+ p = &parent->rb_left;
+ } else if (!nft_rbtree_interval_end(rbe) &&
+ nft_rbtree_interval_end(new)) {
+ p = &parent->rb_right;
+ } else if (nft_set_elem_active(&rbe->ext, genmask)) {
+ *ext = &rbe->ext;
+ return -EEXIST;
+ } else {
+ p = &parent->rb_left;
}
}
}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf] netfilter: nft_set_rbtree: handle re-addition element after deletion
2017-05-21 22:17 [PATCH nf] netfilter: nft_set_rbtree: handle re-addition element after deletion Pablo Neira Ayuso
@ 2017-05-22 6:52 ` Wolfgang Bumiller
0 siblings, 0 replies; 2+ messages in thread
From: Wolfgang Bumiller @ 2017-05-22 6:52 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
On Mon, May 22, 2017 at 12:17:30AM +0200, Pablo Neira Ayuso wrote:
> 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: e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates")
> Reported-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
I can confirm that this fixes the issue for me.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-22 7:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-21 22:17 [PATCH nf] netfilter: nft_set_rbtree: handle re-addition element after deletion Pablo Neira Ayuso
2017-05-22 6:52 ` Wolfgang Bumiller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.