Skip to content

Commit 49718f0

Browse files
AlanSternJames Bottomley
authored andcommitted
SCSI: Fix NULL pointer dereference in runtime PM
The routines in scsi_rpm.c assume that if a runtime-PM callback is invoked for a SCSI device, it can only mean that the device's driver has asked the block layer to handle the runtime power management (by calling blk_pm_runtime_init(), which among other things sets q->dev). However, this assumption turns out to be wrong for things like the ses driver. Normally ses devices are not allowed to do runtime PM, but userspace can override this setting. If this happens, the kernel gets a NULL pointer dereference when blk_post_runtime_resume() tries to use the uninitialized q->dev pointer. This patch fixes the problem by calling the block layer's runtime-PM routines only if the device's driver really does have a runtime-PM callback routine. Since ses doesn't define any such callbacks, the crash won't occur. This fixes Bugzilla #101371. Signed-off-by: Alan Stern <[email protected]> Reported-by: Stanisław Pitucha <[email protected]> Reported-by: Ilan Cohen <[email protected]> Tested-by: Ilan Cohen <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Cc: [email protected] Signed-off-by: James Bottomley <[email protected]>
1 parent db19693 commit 49718f0

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

drivers/scsi/scsi_pm.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ static int sdev_runtime_suspend(struct device *dev)
217217
{
218218
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
219219
struct scsi_device *sdev = to_scsi_device(dev);
220-
int err;
220+
int err = 0;
221221

222-
err = blk_pre_runtime_suspend(sdev->request_queue);
223-
if (err)
224-
return err;
225-
if (pm && pm->runtime_suspend)
222+
if (pm && pm->runtime_suspend) {
223+
err = blk_pre_runtime_suspend(sdev->request_queue);
224+
if (err)
225+
return err;
226226
err = pm->runtime_suspend(dev);
227-
blk_post_runtime_suspend(sdev->request_queue, err);
228-
227+
blk_post_runtime_suspend(sdev->request_queue, err);
228+
}
229229
return err;
230230
}
231231

@@ -248,11 +248,11 @@ static int sdev_runtime_resume(struct device *dev)
248248
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
249249
int err = 0;
250250

251-
blk_pre_runtime_resume(sdev->request_queue);
252-
if (pm && pm->runtime_resume)
251+
if (pm && pm->runtime_resume) {
252+
blk_pre_runtime_resume(sdev->request_queue);
253253
err = pm->runtime_resume(dev);
254-
blk_post_runtime_resume(sdev->request_queue, err);
255-
254+
blk_post_runtime_resume(sdev->request_queue, err);
255+
}
256256
return err;
257257
}
258258

0 commit comments

Comments
 (0)