l2tp: remove unneeded null check in l2tp_v2_session_get_next
authorJames Chapman <jchapman@katalix.com>
Tue, 3 Sep 2024 11:35:47 +0000 (12:35 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 4 Sep 2024 23:39:32 +0000 (16:39 -0700)
Commit aa92c1cec92b ("l2tp: add tunnel/session get_next helpers") uses
idr_get_next APIs to iterate over l2tp session IDR lists.  Sessions in
l2tp_v2_session_idr always have a non-null session->tunnel pointer
since l2tp_session_register sets it before inserting the session into
the IDR. Therefore the null check on session->tunnel in
l2tp_v2_session_get_next is redundant and can be removed. Removing the
check avoids a warning from lkp.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202408111407.HtON8jqa-lkp@intel.com/
CC: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: James Chapman <jchapman@katalix.com>
Acked-by: Tom Parkin <tparkin@katalix.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240903113547.1261048-1-jchapman@katalix.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/l2tp/l2tp_core.c

index 32102d1..3eec23a 100644 (file)
@@ -345,7 +345,7 @@ again:
                        goto again;
                }
 
-               if (tunnel && tunnel->tunnel_id == tid &&
+               if (tunnel->tunnel_id == tid &&
                    refcount_inc_not_zero(&session->ref_count)) {
                        rcu_read_unlock_bh();
                        return session;