diff options
author | Bill Kuzeja <William.Kuzeja@stratus.com> | 2017-03-14 13:28:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-14 08:00:19 -0400 |
commit | 76aa65a2c0fd075c71a93ea93b67f101d187fce5 (patch) | |
tree | 2ebc83954561d17810591c56bb5d716ffa7184a7 | |
parent | 71fd9a94bd3fd35277c9e1cf6a373c1f7a8ec4cd (diff) |
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 734e592a247e..f9b52a4b8c55 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) | |||
1464 | /* Don't abort commands in adapter during EEH | 1464 | /* Don't abort commands in adapter during EEH |
1465 | * recovery as it's not accessible/responding. | 1465 | * recovery as it's not accessible/responding. |
1466 | */ | 1466 | */ |
1467 | if (GET_CMD_SP(sp) && !ha->flags.eeh_busy) { | 1467 | if (GET_CMD_SP(sp) && !ha->flags.eeh_busy && |
1468 | (sp->type == SRB_SCSI_CMD)) { | ||
1468 | /* Get a reference to the sp and drop the lock. | 1469 | /* Get a reference to the sp and drop the lock. |
1469 | * The reference ensures this sp->done() call | 1470 | * The reference ensures this sp->done() call |
1470 | * - and not the call in qla2xxx_eh_abort() - | 1471 | * - and not the call in qla2xxx_eh_abort() - |