Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

l2tp: remove unneeded null check in l2tp_v2_session_get_next

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>

authored by

James Chapman and committed by
Jakub Kicinski
510c0732 17053414

+1 -1
+1 -1
net/l2tp/l2tp_core.c
··· 345 345 goto again; 346 346 } 347 347 348 - if (tunnel && tunnel->tunnel_id == tid && 348 + if (tunnel->tunnel_id == tid && 349 349 refcount_inc_not_zero(&session->ref_count)) { 350 350 rcu_read_unlock_bh(); 351 351 return session;