summaryrefslogtreecommitdiff
path: root/block/blk-exec.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2011-07-07 15:45:40 -0500
committerJames Bottomley <JBottomley@Parallels.com>2011-07-21 14:21:18 -0700
commitbfe159a51203c15d23cb3158fffdc25ec4b4dda1 (patch)
tree553b2d7b1422545032cf3c048db7dff5f5c8dbd3 /block/blk-exec.c
parent79b9677d885d1a792bc103f2febb06f91f92de43 (diff)
downloadlwn-bfe159a51203c15d23cb3158fffdc25ec4b4dda1.tar.gz
lwn-bfe159a51203c15d23cb3158fffdc25ec4b4dda1.zip
[SCSI] fix crash in scsi_dispatch_cmd()
USB surprise removal of sr is triggering an oops in scsi_dispatch_command(). What seems to be happening is that USB is hanging on to a queue reference until the last close of the upper device, so the crash is caused by surprise remove of a mounted CD followed by attempted unmount. The problem is that USB doesn't issue its final commands as part of the SCSI teardown path, but on last close when the block queue is long gone. The long term fix is probably to make sr do the teardown in the same way as sd (so remove all the lower bits on ejection, but keep the upper disk alive until last close of user space). However, the current oops can be simply fixed by not allowing any commands to be sent to a dead queue. Cc: stable@kernel.org Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'block/blk-exec.c')
-rw-r--r--block/blk-exec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index 8a0e7ec056e7..a1ebceb332f9 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
{
int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
+ if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) {
+ rq->errors = -ENXIO;
+ if (rq->end_io)
+ rq->end_io(rq, rq->errors);
+ return;
+ }
+
rq->rq_disk = bd_disk;
rq->end_io = done;
WARN_ON(irqs_disabled());