From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A8B02C2FB2; Tue, 29 Apr 2025 23:52:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745970769; cv=none; b=boQmg5rY8IoQGxKQaCkgEKTWyHPyIt40i0ctHmY/PwMKMMDRQnwgO7GqCLKloSmrTAVyNxaP6CaV/6uDQrkT8PYgOKmM+8A2Cegh48uNbIWz2i8mvkHvBvmbwgCWJ10fUoyp0OwTzqJQ5TTOASr9RpacFRSW7rkfHACF9IYFj8I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745970769; c=relaxed/simple; bh=t0Kz9PtngyrfZ9HJ8s9LrS0iEVto9SIGVhXyHlmHbO0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i50kIoq+Rm4zb1R+UzwbLEQm2obDzOFN6hIQVH2KFBQ4R9qY9p42CV83c8Iic8xhPvHGbCJK3PGimb15S/k4J8s2EZFhFyMoGLr/l2TmugzBmUJ9BWQUbU+zWPKjtGfMIqLn6bOFsk9LvVcC408YMxLBJ4dwrjjDfi21LkeQ49k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dZVuylmv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dZVuylmv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D64AC4CEE3; Tue, 29 Apr 2025 23:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745970768; bh=t0Kz9PtngyrfZ9HJ8s9LrS0iEVto9SIGVhXyHlmHbO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZVuylmvIXrZC6nj76bdy44QrMFppPi9aqAxVE7RxFmEzTYvzygylFjuwo1Wi9jUE fNhjEyf5HXS36/xSexi4Xj+AGy0t6RlxL/zTsXi3bKxACxwP8r/wjqHLUkk6JK8cod zETGUJcDLYesf0zsBeRJutUdM/uELbMxoz4ybm+cvyxMOVapWc+IJapOQW3o4iWS3V TQ2Z37hvvdpO002aH4YPQSXpycjFydqyGcxMfg71KdQIMIxNyNgmWnDIRVjEeQu+pm sjlZMCYujOa7O6ZeAlddvm17Hms0KKkPsX2Atn53U7oZMSi8ueQkHwLgcvwObXGHqC c13lVKjHy3Iww== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Bogdanov , Maurizio Lombardi , "Martin K . Petersen" , Sasha Levin , linux@treblig.org, ebiggers@google.com, ardb@kernel.org, viro@zeniv.linux.org.uk, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 07/21] scsi: target: iscsi: Fix timeout on deleted connection Date: Tue, 29 Apr 2025 19:52:19 -0400 Message-Id: <20250429235233.537828-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250429235233.537828-1-sashal@kernel.org> References: <20250429235233.537828-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.88 Content-Transfer-Encoding: 8bit From: Dmitry Bogdanov [ Upstream commit 7f533cc5ee4c4436cee51dc58e81dfd9c3384418 ] NOPIN response timer may expire on a deleted connection and crash with such logs: Did not receive response to NOPIN on CID: 0, failing connection for I_T Nexus (null),i,0x00023d000125,iqn.2017-01.com.iscsi.target,t,0x3d BUG: Kernel NULL pointer dereference on read at 0x00000000 NIP strlcpy+0x8/0xb0 LR iscsit_fill_cxn_timeout_err_stats+0x5c/0xc0 [iscsi_target_mod] Call Trace: iscsit_handle_nopin_response_timeout+0xfc/0x120 [iscsi_target_mod] call_timer_fn+0x58/0x1f0 run_timer_softirq+0x740/0x860 __do_softirq+0x16c/0x420 irq_exit+0x188/0x1c0 timer_interrupt+0x184/0x410 That is because nopin response timer may be re-started on nopin timer expiration. Stop nopin timer before stopping the nopin response timer to be sure that no one of them will be re-started. Signed-off-by: Dmitry Bogdanov Link: https://lore.kernel.org/r/20241224101757.32300-1-d.bogdanov@yadro.com Reviewed-by: Maurizio Lombardi Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/iscsi/iscsi_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index b516c2893420b..b756d4cfecfe9 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -4323,8 +4323,8 @@ int iscsit_close_connection( spin_unlock(&iscsit_global->ts_bitmap_lock); iscsit_stop_timers_for_cmds(conn); - iscsit_stop_nopin_response_timer(conn); iscsit_stop_nopin_timer(conn); + iscsit_stop_nopin_response_timer(conn); if (conn->conn_transport->iscsit_wait_conn) conn->conn_transport->iscsit_wait_conn(conn); -- 2.39.5