[3.19.y-ckt stable] Patch "SCSI: fix crashes in sd and sr runtime PM" has been added to the 3.19.y-ckt tree

[Paul Menzel]

Dear Kamal, dear Alan,


Am Dienstag, den 09.02.2016, 14:42 -0800 schrieb Kamal Mostafa:
> This is a note to let you know that I have just added a patch titled
> 
>     SCSI: fix crashes in sd and sr runtime PM
> 
> to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
> which can be found at:
> 
>     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
> 
> This patch is scheduled to be released in version 3.19.8-ckt15.
> 
> If you, or anyone else, feels it should not be added to this tree, please 
> reply to this email.

just a small note, that the reported crashes, this patches fixes, were
not reproducible on my system with Linux 3.19.

Alan, do you think, it should still be applied to Linux 3.19 and before?

> For more information about the 3.19.y-ckt tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable


Thanks,

Paul


> ---8<------------------------------------------------------------
> 
> From 21d9cdc655e325e5b444af66c036041f1a715d2e Mon Sep 17 00:00:00 2001
> From: Alan Stern <stern at rowland.harvard.edu>
> Date: Wed, 20 Jan 2016 11:26:01 -0500
> Subject: SCSI: fix crashes in sd and sr runtime PM
> 
> commit 13b4389143413a1f18127c07f72c74cad5b563e8 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: Alan Stern <stern at rowland.harvard.edu>
> Reported-by: Paul Menzel <paul.menzel at giantmonkey.de>
> Reported-by: Erich Schubert <erich at debian.org>
> Reported-by: Alexandre Rossi <alexandre.rossi at gmail.com>
> Tested-by: Paul Menzel <paul.menzel at giantmonkey.de>
> Tested-by: Erich Schubert <erich at debian.org>
> Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>  drivers/scsi/sd.c | 7 +++++--
>  drivers/scsi/sr.c | 4 ++++
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index c80e1fe..f780463 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -3168,8 +3168,8 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
>  	struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
>  	int ret = 0;
> 
> -	if (!sdkp)
> -		return 0;	/* this can happen */
> +	if (!sdkp)	/* E.g.: runtime suspend following sd_remove() */
> +		return 0;
> 
>  	if (sdkp->WCE && sdkp->media_present) {
>  		sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
> @@ -3210,6 +3210,9 @@ static int sd_resume(struct device *dev)
>  	struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
>  	int ret = 0;
> 
> +	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
> +		return 0;
> +
>  	if (!sdkp->device->manage_start_stop)
>  		goto done;
> 
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
> index 8bd54a6..64c8674 100644
> --- a/drivers/scsi/sr.c
> +++ b/drivers/scsi/sr.c
> @@ -144,6 +144,9 @@ static int sr_runtime_suspend(struct device *dev)
>  {
>  	struct scsi_cd *cd = dev_get_drvdata(dev);
> 
> +	if (!cd)	/* E.g.: runtime suspend following sr_remove() */
> +		return 0;
> +
>  	if (cd->media_present)
>  		return -EBUSY;
>  	else
> @@ -985,6 +988,7 @@ static int sr_remove(struct device *dev)
>  	scsi_autopm_get_device(cd->device);
> 
>  	del_gendisk(cd->disk);
> +	dev_set_drvdata(dev, NULL);
> 
>  	mutex_lock(&sr_ref_mutex);
>  	kref_put(&cd->kref, sr_kref_release);
> --
> 1.9.1
-- 
GPG-Schlüssel: 33623E9B
Fingerabdruck = 0EB1 649D 4361 D04F 3C70  6F71 4DD7 BF75 3362 3E9B

Giant Monkey Software Engineering GmbH

Brunnenstr. 7D
10119 Berlin Mitte

Geschäftsführer Adrian Fuhrmann, Lion Vollnhals und Paul Menzel

USt-IdNr.: DE281524720
HRB 139495 B Amtsgericht Charlottenburg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20160213/8792f02f/attachment.sig>