| Message ID | 20210911135159.20543-1-dinghui@sangfor.com.cn |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] scsi: libiscsi: move init ehwait to iscsi_session_setup() | expand |
On 9/11/21 8:51 AM, Ding Hui wrote: > 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") > Signed-off-by: Ding Hui <dinghui@sangfor.com.cn> > --- > v2: > update commit log > > drivers/scsi/libiscsi.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c > index 4683c183e9d4..712a45368385 100644 > --- a/drivers/scsi/libiscsi.c > +++ b/drivers/scsi/libiscsi.c > @@ -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: > Reviewed-by: Mike Christie <michael.christie@oracle.com>
Ding, > 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! -- Martin K. Petersen Oracle Linux Engineering
On Sat, 11 Sep 2021 21:51:59 +0800, Ding Hui wrote: > 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 -- Martin K. Petersen Oracle Linux Engineering
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 4683c183e9d4..712a45368385 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -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:
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") Signed-off-by: Ding Hui <dinghui@sangfor.com.cn> --- v2: update commit log drivers/scsi/libiscsi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)