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 EB2E5282E1; Tue, 12 Aug 2025 18:20:27 +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=1755022828; cv=none; b=jZ2naCyoo9lIvsonoUq+dlqYuuQ5vyLUDdbEHCWxvb9DHCyH8rBYQ4QdfQHy5fc2xo+ovxJun6Tw6w8P9vUVuGtU6XzgZk+ZvoPZcBRoKOOVzc+ZmcTaczn5LhGMKCGlxtZg+5HZjkPwjnTCeHU4bD5hjkLucSTQECq7amiYrfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022828; c=relaxed/simple; bh=8i72Y1iUdkpra6poWdSJ2wuM4PSxcMtJVIJzAS/8wJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fHkKp43LWTasRkR9R8zjbmDJkpVCK9E3kAnl9kBdr/p6tlJ099St8UnHvKkEgvteAHp6Kaf29BKjxgqkz46tIgDqG7wc2L61D6YxNydZSvrvUWX8xU/ajIgoS3P4t6rwZhJrfA4ipb1/7ZQGAFvCyl5W77zrDLC6/gBbhEZ0cmg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sPQgXfx2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sPQgXfx2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1392AC4CEF6; Tue, 12 Aug 2025 18:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755022827; bh=8i72Y1iUdkpra6poWdSJ2wuM4PSxcMtJVIJzAS/8wJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPQgXfx2B6Q6jkW6AEmQ8t0pFONVmWSDJqK/x5qCZOjBtpcsZjGjaQOTEXVKi/l1X nwohdcuRHy2lmYJJ8b9lbr5CNo87gyyWhk4Y879DYXnovrCdFIfYAllV/3ghgxKBeR FoK5X74G1857II1/mzxa02kCBdeR20IROgX+grG8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li Lingfeng , Mike Christie , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.12 270/369] scsi: Revert "scsi: iscsi: Fix HW conn removal use after free" Date: Tue, 12 Aug 2025 19:29:27 +0200 Message-ID: <20250812173024.913645280@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173014.736537091@linuxfoundation.org> References: <20250812173014.736537091@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li Lingfeng [ Upstream commit 7bdc68921481c19cd8c85ddf805a834211c19e61 ] This reverts commit c577ab7ba5f3bf9062db8a58b6e89d4fe370447e. The invocation of iscsi_put_conn() in iscsi_iter_destory_conn_fn() is used to free the initial reference counter of iscsi_cls_conn. For non-qla4xxx cases, the ->destroy_conn() callback (e.g., iscsi_conn_teardown) will call iscsi_remove_conn() and iscsi_put_conn() to remove the connection from the children list of session and free the connection at last. However for qla4xxx, it is not the case. The ->destroy_conn() callback of qla4xxx will keep the connection in the session conn_list and doesn't use iscsi_put_conn() to free the initial reference counter. Therefore, it seems necessary to keep the iscsi_put_conn() in the iscsi_iter_destroy_conn_fn(), otherwise, there will be memory leak problem. Link: https://lore.kernel.org/all/88334658-072b-4b90-a949-9c74ef93cfd1@huawei.com/ Fixes: c577ab7ba5f3 ("scsi: iscsi: Fix HW conn removal use after free") Signed-off-by: Li Lingfeng Link: https://lore.kernel.org/r/20250715073926.3529456-1-lilingfeng3@huawei.com Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_transport_iscsi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 7a5bebf5b096..7528bb7c06bb 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -2170,6 +2170,8 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data) return 0; iscsi_remove_conn(iscsi_dev_to_conn(dev)); + iscsi_put_conn(iscsi_dev_to_conn(dev)); + return 0; } -- 2.39.5