Skip to contentSkip to conversation

scsi: libiscsi: move init ehwait to iscsi_session_setup()

PATCH Applied Ding Hui 3 participants 4 messages Sep 11, 2021 – Sep 22, 2021

Subsystems (2)
lore
Share & tools
lore

Ding Hui

author
#0 lore raw

PATCH v2 1/1 scsi: libiscsi: move init ehwait to iscsi_session_setup()

The commit ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets") move member ehwait from conn to session, but left init ehwait in iscsi_conn_setup().

Although a session can only have 1 conn currently, it is better to do init ehwait in iscsi_session_setup() to prevent reinit by mistake, also in case we can handle multiple conns in the future.

Fixes ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets")

---
v2:
update commit log

 drivers/scsi/libiscsi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/libiscsi.c +1 -2
index 4683c183e9d4..712a45368385 100644
@@ -2947,6 +2947,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
 	session->tmf_state = TMF_INITIAL;
 	timer_setup(&session->tmf_timer, iscsi_tmf_timedout, 0);
 	mutex_init(&session->eh_mutex);
+	init_waitqueue_head(&session->ehwait);
 
 	spin_lock_init(&session->frwd_lock);
 	spin_lock_init(&session->back_lock);
@@ -3074,8 +3075,6 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
 		goto login_task_data_alloc_fail;
 	conn->login_task->data = conn->data = data;
 
-	init_waitqueue_head(&session->ehwait);
-
 	return cls_conn;
 
 login_task_data_alloc_fail:
Signature · 1 line
2.17.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 31 lines · Ding Hui

The commit ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets") move member ehwait from conn to session, but left init ehwait in iscsi_conn_setup().

Although a session can only have 1 conn currently, it is better to do init ehwait in iscsi_session_setup() to prevent reinit by mistake, also in case we can handle multiple conns in the future.

Fixes ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets")

---
v2:
update commit log

 drivers/scsi/libiscsi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/libiscsi.c +1 -0
index 4683c183e9d4..712a45368385 100644
@@ -2947,6 +2947,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
 	session->tmf_state = TMF_INITIAL;
 	timer_setup(&session->tmf_timer, iscsi_tmf_timedout, 0);
 	mutex_init(&session->eh_mutex);
+	init_waitqueue_head(&session->ehwait);
 
 	spin_lock_init(&session->frwd_lock);
 	spin_lock_init(&session->back_lock);

drivers/scsi/libiscsi.c iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, · line 3080

Quoted 8 lines
drivers/scsi/libiscsi.c +0 -2
@@ -3074,8 +3075,6 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
 		goto login_task_data_alloc_fail;
 	conn->login_task->data = conn->data = data;
 
-	init_waitqueue_head(&session->ehwait);
-
 	return cls_conn;
 
 login_task_data_alloc_fail:
#2 lore raw
In reply to Ding Hui

Ding,

Quoted 7 lines

The commit ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets") move member ehwait from conn to session, but left init ehwait in iscsi_conn_setup().

Although a session can only have 1 conn currently, it is better to do init ehwait in iscsi_session_setup() to prevent reinit by mistake, also in case we can handle multiple conns in the future.

Applied to 5.16/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw
In reply to Ding Hui
Quoted 9 lines · Ding Hui

The commit ec29d0ac29be ("scsi: iscsi: Fix conn use after free during resets") move member ehwait from conn to session, but left init ehwait in iscsi_conn_setup().

Although a session can only have 1 conn currently, it is better to do init ehwait in iscsi_session_setup() to prevent reinit by mistake, also in case we can handle multiple conns in the future.

[...]

Applied to 5.16/scsi-queue, thanks!

[1/1] scsi: libiscsi: move init ehwait to iscsi_session_setup()

      https://git.kernel.org/mkp/scsi/c/e018f03d6ccb
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering