]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
netfilter: nft_set_rbtree: remove dead conditional
authorFlorian Westphal <fw@strlen.de>
Sat, 11 Apr 2026 21:13:08 +0000 (23:13 +0200)
committerFlorian Westphal <fw@strlen.de>
Sun, 24 May 2026 20:55:47 +0000 (22:55 +0200)
net/netfilter/nft_set_rbtree.c:399 __nft_rbtree_insert()
        warn: 'removed_end' is not an error pointer

Since commit : 087388278e0f ("netfilter: nf_tables: nft_set_rbtree: fix
spurious insertion failure") __nft_rbtree_insert() can no longer fail
and this condition is always false.  Remove it.

Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/netfilter-devel/adjSaolTji0mPgqx@stanley.mountain/
Signed-off-by: Florian Westphal <fw@strlen.de>
net/netfilter/nft_set_rbtree.c

index 560fbe6e3f75023f0b89546f4e846b8450258693..b4f0b5fdf1f26587844a37476189e16e6cbd6340 100644 (file)
@@ -396,9 +396,6 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set,
                        const struct nft_rbtree_elem *removed_end;
 
                        removed_end = nft_rbtree_gc_elem(set, priv, rbe);
-                       if (IS_ERR(removed_end))
-                               return PTR_ERR(removed_end);
-
                        if (removed_end == rbe_le || removed_end == rbe_ge)
                                return -EAGAIN;