diff options
| author |   Bill Kuzeja <William.Kuzeja@stratus.com> | 2017-03-14 13:28:44 -0400 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2017-03-15 18:51:02 -0400 |
| commit | 5f7c2beef819d9ea2d1b814edf6f5981420e9cf8 (patch) | |
| tree | 759027138b3f5f5b28951ead76bbfb86b783fe43 /drivers/scsi | |
| parent | scsi: lpfc: Finalize Kconfig options for nvme (diff) | |
| download | linux-dev-5f7c2beef819d9ea2d1b814edf6f5981420e9cf8.tar.xz linux-dev-5f7c2beef819d9ea2d1b814edf6f5981420e9cf8.zip | |
scsi: qla2xxx: Fix crash in qla2xxx_eh_abort on bad ptr
After a Qlogic card breaks when initializing (test case), the system can
crash in qla2xxx_eh_abort if processing anything but a scsi command type
srb.
Fixes: 1535aa75a3d8 ("scsi: qla2xxx: fix invalid DMA access after command aborts in PCI device remove")
Signed-off-by: Bill Kuzeja <william.kuzeja@stratus.com>
Acked-By: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 71b6b20ae82b..579363a6f44f 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1617,7 +1617,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res) /* Don't abort commands in adapter during EEH * recovery as it's not accessible/responding. */ - if (GET_CMD_SP(sp) && !ha->flags.eeh_busy) { + if (GET_CMD_SP(sp) && !ha->flags.eeh_busy && + (sp->type == SRB_SCSI_CMD)) { /* Get a reference to the sp and drop the lock. * The reference ensures this sp->done() call * - and not the call in qla2xxx_eh_abort() - |