netfilter: nft_set_rbtree: handle element re-addition after deletion
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 20 May 2017 22:37:10 +0000 (00:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jun 2017 13:06:06 +0000 (15:06 +0200)
commit3eb235a1af142e09f48d022970cfbde20603af9e
treed64504dd37ea46dff3dbbd97fcebb9509429bdb1
parenta8fc3159ee2c5aa0f557bc4581f8a32461f74407
netfilter: nft_set_rbtree: handle element re-addition after deletion

commit d2df92e98a34a5619dadd29c6291113c009181e7 upstream.

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>
Tested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/netfilter/nft_set_rbtree.c