Skip to content

Commit 2ac819e

Browse files
Moger, Babugregkh
Moger, Babu
authored andcommitted
scsi_dh: check queuedata pointer before proceeding further
commit a18a920 upstream. This patch validates sdev pointer in scsi_dh_activate before proceeding further. Without this check we might see the panic as below. I have seen this panic multiple times.. Call trace: #0 [ffff88007d647b50] machine_kexec at ffffffff81020902 #1 [ffff88007d647ba0] crash_kexec at ffffffff810875b0 #2 [ffff88007d647c70] oops_end at ffffffff8139c650 #3 [ffff88007d647c90] __bad_area_nosemaphore at ffffffff8102dd15 #4 [ffff88007d647d50] page_fault at ffffffff8139b8cf [exception RIP: scsi_dh_activate+0x82] RIP: ffffffffa0041922 RSP: ffff88007d647e00 RFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00000000000093c5 RDX: 00000000000093c5 RSI: ffffffffa02e6640 RDI: ffff88007cc88988 RBP: 000000000000000f R8: ffff88007d646000 R9: 0000000000000000 R10: ffff880082293790 R11: 00000000ffffffff R12: ffff88007cc88988 R13: 0000000000000000 R14: 0000000000000286 R15: ffff880037b845e0 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0000 #5 [ffff88007d647e38] run_workqueue at ffffffff81060268 torvalds#6 [ffff88007d647e78] worker_thread at ffffffff81060386 torvalds#7 [ffff88007d647ee8] kthread at ffffffff81064436 torvalds#8 [ffff88007d647f48] kernel_thread at ffffffff81003fba Signed-off-by: Babu Moger <babu.moger@netapp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent 2753feb commit 2ac819e

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

drivers/scsi/device_handler/scsi_dh.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,15 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data)
398398

399399
spin_lock_irqsave(q->queue_lock, flags);
400400
sdev = q->queuedata;
401-
if (sdev && sdev->scsi_dh_data)
401+
if (!sdev) {
402+
spin_unlock_irqrestore(q->queue_lock, flags);
403+
err = SCSI_DH_NOSYS;
404+
if (fn)
405+
fn(data, err);
406+
return err;
407+
}
408+
409+
if (sdev->scsi_dh_data)
402410
scsi_dh = sdev->scsi_dh_data->scsi_dh;
403411
dev = get_device(&sdev->sdev_gendev);
404412
if (!scsi_dh || !dev ||

0 commit comments

Comments
 (0)