Commit 3d1df278 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

SCSI: fix crashes in sd and sr runtime PM

commit 13b43891 upstream.

Runtime suspend during driver probe and removal can cause problems.
The driver's runtime_suspend or runtime_resume callbacks may invoked
before the driver has finished binding to the device or after the
driver has unbound from the device.

This problem shows up with the sd and sr drivers, and can cause disk
or CD/DVD drives to become unusable as a result.  The fix is simple.
The drivers store a pointer to the scsi_disk or scsi_cd structure as
their private device data when probing is finished, so we simply have
to be sure to clear the private data during removal and test it during
runtime suspend/resume.

This fixes <https://bugs.debian.org/801925>.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarPaul Menzel <paul.menzel@giantmonkey.de>
Reported-by: default avatarErich Schubert <erich@debian.org>
Reported-by: default avatarAlexandre Rossi <alexandre.rossi@gmail.com>
Tested-by: default avatarPaul Menzel <paul.menzel@giantmonkey.de>
Tested-by: default avatarErich Schubert <erich@debian.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bac26cab
...@@ -3090,8 +3090,8 @@ static int sd_suspend(struct device *dev) ...@@ -3090,8 +3090,8 @@ static int sd_suspend(struct device *dev)
struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev); struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
int ret = 0; int ret = 0;
if (!sdkp) if (!sdkp) /* E.g.: runtime suspend following sd_remove() */
return 0; /* this can happen */ return 0;
if (sdkp->WCE) { if (sdkp->WCE) {
sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n"); sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
...@@ -3115,6 +3115,9 @@ static int sd_resume(struct device *dev) ...@@ -3115,6 +3115,9 @@ static int sd_resume(struct device *dev)
struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev); struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
int ret = 0; int ret = 0;
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
return 0;
if (!sdkp->device->manage_start_stop) if (!sdkp->device->manage_start_stop)
goto done; goto done;
......
...@@ -142,6 +142,9 @@ static int sr_runtime_suspend(struct device *dev) ...@@ -142,6 +142,9 @@ static int sr_runtime_suspend(struct device *dev)
{ {
struct scsi_cd *cd = dev_get_drvdata(dev); struct scsi_cd *cd = dev_get_drvdata(dev);
if (!cd) /* E.g.: runtime suspend following sr_remove() */
return 0;
if (cd->media_present) if (cd->media_present)
return -EBUSY; return -EBUSY;
else else
...@@ -1006,6 +1009,7 @@ static int sr_remove(struct device *dev) ...@@ -1006,6 +1009,7 @@ static int sr_remove(struct device *dev)
blk_queue_prep_rq(cd->device->request_queue, scsi_prep_fn); blk_queue_prep_rq(cd->device->request_queue, scsi_prep_fn);
del_gendisk(cd->disk); del_gendisk(cd->disk);
dev_set_drvdata(dev, NULL);
mutex_lock(&sr_ref_mutex); mutex_lock(&sr_ref_mutex);
kref_put(&cd->kref, sr_kref_release); kref_put(&cd->kref, sr_kref_release);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment