* [RESEND PATCH] scsi: shost->async_scan should be protected by mutex_lock
@ 2017-10-13 6:55 ` Ouyangzhaowei (Charles)
0 siblings, 0 replies; 2+ messages in thread
From: Ouyangzhaowei (Charles) @ 2017-10-13 6:55 UTC (permalink / raw)
To: Tyrel Datwyler, jejb, martin.petersen, linux-kernel
Cc: linux-scsi, Suoben, Wulizhen (Pss)
shost->async_scan should be protected by mutex_lock, otherwise the check
of "called twice" won't work.
Signed-off-by: Ouyang Zhaowei <ouyangzhaowei@huawei.com>
---
drivers/scsi/scsi_scan.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index fd88dab..20d539b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1722,9 +1722,10 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
if (strncmp(scsi_scan_type, "sync", 4) == 0)
return NULL;
+ mutex_lock(&shost->scan_mutex);
if (shost->async_scan) {
shost_printk(KERN_DEBUG, shost, "%s called twice\n",
__func__);
- return NULL;
+ goto unlock;
}
data = kmalloc(sizeof(*data), GFP_KERNEL);
@@ -1735,7 +1736,6 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
goto err;
init_completion(&data->prev_finished);
- mutex_lock(&shost->scan_mutex);
spin_lock_irqsave(shost->host_lock, flags);
shost->async_scan = 1;
spin_unlock_irqrestore(shost->host_lock, flags);
@@ -1751,6 +1751,8 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
err:
kfree(data);
+ unlock:
+ mutex_unlock(&shost->scan_mutex);
return NULL;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RESEND PATCH] scsi: shost->async_scan should be protected by mutex_lock
@ 2017-10-13 6:55 ` Ouyangzhaowei (Charles)
0 siblings, 0 replies; 2+ messages in thread
From: Ouyangzhaowei (Charles) @ 2017-10-13 6:55 UTC (permalink / raw)
To: Tyrel Datwyler, jejb, martin.petersen, linux-kernel
Cc: linux-scsi, Suoben, Wulizhen (Pss)
shost->async_scan should be protected by mutex_lock, otherwise the check
of "called twice" won't work.
Signed-off-by: Ouyang Zhaowei <ouyangzhaowei@huawei.com>
---
drivers/scsi/scsi_scan.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index fd88dab..20d539b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1722,9 +1722,10 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
if (strncmp(scsi_scan_type, "sync", 4) == 0)
return NULL;
+ mutex_lock(&shost->scan_mutex);
if (shost->async_scan) {
shost_printk(KERN_DEBUG, shost, "%s called twice\n",
__func__);
- return NULL;
+ goto unlock;
}
data = kmalloc(sizeof(*data), GFP_KERNEL);
@@ -1735,7 +1736,6 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
goto err;
init_completion(&data->prev_finished);
- mutex_lock(&shost->scan_mutex);
spin_lock_irqsave(shost->host_lock, flags);
shost->async_scan = 1;
spin_unlock_irqrestore(shost->host_lock, flags);
@@ -1751,6 +1751,8 @@ static struct async_scan_data
*scsi_prep_async_scan(struct Scsi_Host *shost)
err:
kfree(data);
+ unlock:
+ mutex_unlock(&shost->scan_mutex);
return NULL;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-13 6:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-13 6:55 [RESEND PATCH] scsi: shost->async_scan should be protected by mutex_lock Ouyangzhaowei (Charles)
2017-10-13 6:55 ` Ouyangzhaowei (Charles)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.