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)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 23 Jul 2017 02:57:02 +0000 (02:57 +0000)
commitde1871157482bedfc43b27854e80cbbb1ebde82e
tree9a27ca6126e8acec4a707d9f72c2d5be34dcb403
parentb16fcee3264f3c9cda77e13cfc3ccc030e4d1628
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