mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
netfilter: nft_rbtree: fix locking
Fix a race condition and unnecessary locking: * the root rb_node must only be accessed under the lock in nft_rbtree_lookup() * the lock is not needed in lookup functions in netlink context Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
8d0451638a
commit
16c45eda96
1 changed files with 2 additions and 4 deletions
|
@ -37,10 +37,11 @@ static bool nft_rbtree_lookup(const struct nft_set *set,
|
||||||
{
|
{
|
||||||
const struct nft_rbtree *priv = nft_set_priv(set);
|
const struct nft_rbtree *priv = nft_set_priv(set);
|
||||||
const struct nft_rbtree_elem *rbe, *interval = NULL;
|
const struct nft_rbtree_elem *rbe, *interval = NULL;
|
||||||
const struct rb_node *parent = priv->root.rb_node;
|
const struct rb_node *parent;
|
||||||
int d;
|
int d;
|
||||||
|
|
||||||
spin_lock_bh(&nft_rbtree_lock);
|
spin_lock_bh(&nft_rbtree_lock);
|
||||||
|
parent = priv->root.rb_node;
|
||||||
while (parent != NULL) {
|
while (parent != NULL) {
|
||||||
rbe = rb_entry(parent, struct nft_rbtree_elem, node);
|
rbe = rb_entry(parent, struct nft_rbtree_elem, node);
|
||||||
|
|
||||||
|
@ -158,7 +159,6 @@ static int nft_rbtree_get(const struct nft_set *set, struct nft_set_elem *elem)
|
||||||
struct nft_rbtree_elem *rbe;
|
struct nft_rbtree_elem *rbe;
|
||||||
int d;
|
int d;
|
||||||
|
|
||||||
spin_lock_bh(&nft_rbtree_lock);
|
|
||||||
while (parent != NULL) {
|
while (parent != NULL) {
|
||||||
rbe = rb_entry(parent, struct nft_rbtree_elem, node);
|
rbe = rb_entry(parent, struct nft_rbtree_elem, node);
|
||||||
|
|
||||||
|
@ -173,11 +173,9 @@ static int nft_rbtree_get(const struct nft_set *set, struct nft_set_elem *elem)
|
||||||
!(rbe->flags & NFT_SET_ELEM_INTERVAL_END))
|
!(rbe->flags & NFT_SET_ELEM_INTERVAL_END))
|
||||||
nft_data_copy(&elem->data, rbe->data);
|
nft_data_copy(&elem->data, rbe->data);
|
||||||
elem->flags = rbe->flags;
|
elem->flags = rbe->flags;
|
||||||
spin_unlock_bh(&nft_rbtree_lock);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spin_unlock_bh(&nft_rbtree_lock);
|
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue