Commit e73e079bf128d68284efedeba1fbbc18d78610f9

Authored by James Bottomley
Committed by James Bottomley
1 parent 1fa7b6a29c

[SCSI] Fix oops caused by queue refcounting failure

In certain circumstances, we can get an oops from a torn down device.
Most notably this is from CD roms trying to call scsi_ioctl.  The root
cause of the problem is the fact that after scsi_remove_device() has
been called, the queue is fully torn down.  This is actually wrong
since the queue can be used until the sdev release function is called.
Therefore, we add an extra reference to the queue which is released in
sdev->release, so the queue always exists.

Reported-by: Parag Warudkar <parag.lkml@gmail.com>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <jbottomley@parallels.com>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

drivers/scsi/scsi_scan.c
... ... @@ -297,7 +297,7 @@
297 297 kfree(sdev);
298 298 goto out;
299 299 }
300   -
  300 + blk_get_queue(sdev->request_queue);
301 301 sdev->request_queue->queuedata = sdev;
302 302 scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
303 303  
drivers/scsi/scsi_sysfs.c
... ... @@ -322,6 +322,7 @@
322 322 kfree(evt);
323 323 }
324 324  
  325 + blk_put_queue(sdev->request_queue);
325 326 /* NULL queue means the device can't be used */
326 327 sdev->request_queue = NULL;
327 328