Skip to content

Commit 4933567

Browse files
Li Lingfenggregkh
authored andcommitted
scsi: Revert "scsi: iscsi: Fix HW conn removal use after free"
[ Upstream commit 7bdc689 ] This reverts commit c577ab7. 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: c577ab7 ("scsi: iscsi: Fix HW conn removal use after free") Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Link: https://lore.kernel.org/r/20250715073926.3529456-1-lilingfeng3@huawei.com Reviewed-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 087a8a7 commit 4933567

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/scsi/scsi_transport_iscsi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,6 +2169,8 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data)
21692169
return 0;
21702170

21712171
iscsi_remove_conn(iscsi_dev_to_conn(dev));
2172+
iscsi_put_conn(iscsi_dev_to_conn(dev));
2173+
21722174
return 0;
21732175
}
21742176

0 commit comments

Comments
 (0)