diff options
author | Bart Van Assche <bvanassche@acm.org> | 2012-06-29 17:33:22 +0200 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-07-20 09:58:40 +0200 |
commit | 67bd94130015c507011af37858989b199c52e1de (patch) | |
tree | 9b4bc8ef5c7180d920eae0f95158dc377c38df8c /Makefile | |
parent | [SCSI] block: Fix blk_execute_rq_nowait() dead queue handling (diff) | |
download | linux-67bd94130015c507011af37858989b199c52e1de.tar.xz linux-67bd94130015c507011af37858989b199c52e1de.zip |
[SCSI] Fix device removal NULL pointer dereference
Use blk_queue_dead() to test whether the queue is dead instead
of !sdev. Since scsi_prep_fn() may be invoked concurrently with
__scsi_remove_device(), keep the queuedata (sdev) pointer in
__scsi_remove_device(). This patch fixes a kernel oops that
can be triggered by USB device removal. See also
http://www.spinics.net/lists/linux-scsi/msg56254.html.
Other changes included in this patch:
- Swap the blk_cleanup_queue() and kfree() calls in
scsi_host_dev_release() to make that code easier to grasp.
- Remove the queue dead check from scsi_run_queue() since the
queue state can change anyway at any point in that function
where the queue lock is not held.
- Remove the queue dead check from the start of scsi_request_fn()
since it is redundant with the scsi_device_online() check.
Reported-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Tejun Heo <tj@kernel.org>
Cc: <stable@kernel.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions