netfilter: nft_set_rbtree: bogus lookup/get on consecutive elements in named sets
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/1 netfilter: nft_set_rbtree: bogus lookup/get on consecutive elements in named sets
The existing rbtree implementation might store consecutive elements where the closing element and the opening element might overlap, eg.
[ a, a+1) [ a+1, a+2)
This patch removes the optimization for non-anonymous sets in the exact matching case, where it is assumed to stop searching in case that the closing element is found. Instead, invalidate candidate interval and keep looking further in the tree.
This patch fixes the lookup and get operations.
Fixes e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates")
Fixes ba0e4d9917b4 ("netfilter: nf_tables: get set elements via netlink")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: missing closing bracket on _get() reported by Phil Sutter.
net/netfilter/nft_set_rbtree.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
net/netfilter/nft_set_rbtree.c +16 -5
@@ -74,8 +74,13 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *set parent =rcu_dereference_raw (parent->rb_left);continue ; } -if (nft_rbtree_interval_end (rbe)) - goto out; +if (nft_rbtree_interval_end (rbe)) { +if (set->flags &NFT_SET_ANONYMOUS ) +return false; + parent =rcu_dereference_raw (parent->rb_left); + interval =NULL ; +continue ; + } *ext = &rbe->ext;return true;
@@ -88,7 +93,7 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *set *ext = &interval->ext;return true; } -out: +return false; }
@@ -139,8 +144,10 @@ static bool __nft_rbtree_get(const struct net *net, const struct nft_set *set,if (flags &NFT_SET_ELEM_INTERVAL_END ) interval = rbe; } else { - if (!nft_set_elem_active(&rbe->ext, genmask)) + if (!nft_set_elem_active(&rbe->ext, genmask)) { parent = rcu_dereference_raw(parent->rb_left); + continue; + } if (!nft_set_ext_exists(&rbe->ext, NFT_SET_EXT_FLAGS) || (*nft_set_ext_flags(&rbe->ext) & NFT_SET_ELEM_INTERVAL_END) ==
@@ -148,7 +155,11 @@ static bool __nft_rbtree_get(const struct net *net, const struct nft_set *set, *elem = rbe;return true; } -return false; + +if (nft_rbtree_interval_end (rbe)) + interval =NULL ; + + parent =rcu_dereference_raw (parent->rb_left); } }
Signature · 1 line
2.11.0