diff options
| author | Bill Kuzeja <William.Kuzeja@stratus.com> | 2017-03-14 17:28:44 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-14 12:00:19 (GMT) |
| commit | 76aa65a2c0fd075c71a93ea93b67f101d187fce5 (patch) | |
| tree | 2ebc83954561d17810591c56bb5d716ffa7184a7 | |
| parent | 71fd9a94bd3fd35277c9e1cf6a373c1f7a8ec4cd (diff) | |
| download | linux-76aa65a2c0fd075c71a93ea93b67f101d187fce5.tar.xz | |
scsi: qla2xxx: Fix crash in qla2xxx_eh_abort on bad ptr
commit 5f7c2beef819d9ea2d1b814edf6f5981420e9cf8 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 734e592..f9b52a4 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -1464,7 +1464,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() - |