summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_init.c
diff options
context:
space:
mode:
authorArun Easi <arun.easi@qlogic.com>2013-03-25 02:21:37 -0400
committerJames Bottomley <JBottomley@Parallels.com>2013-04-06 11:30:16 +0100
commit00876ae85b47cdfe76aa08b1fffb27fd67425f53 (patch)
tree566e67e1d86f2280aad0f2337d7b52ad2955ca9f /drivers/scsi/qla2xxx/qla_init.c
parente9f4f418076f7d08a73667472b5f74a02965221d (diff)
downloadop-kernel-dev-00876ae85b47cdfe76aa08b1fffb27fd67425f53.zip
op-kernel-dev-00876ae85b47cdfe76aa08b1fffb27fd67425f53.tar.gz
[SCSI] qla2xxx: Fix crash during firmware dump procedure.
System crashes, in initiator mode operation, with qla2xxx_copy_atioqueues() in stack trace when firmware dump is attempted. Check for atio_q_length alone does not indicate if atio_ring is allocated, make explicit check of atio_ring to avoid the crash. Applicable to ISP24xx, ISP25xx, ISP81xx & ISP83xx line of HBAs. Signed-off-by: Arun Easi <arun.easi@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 09eae54..b592033 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1397,7 +1397,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha)
mq_size += ha->max_rsp_queues *
(rsp->length * sizeof(response_t));
}
- if (ha->tgt.atio_q_length)
+ if (ha->tgt.atio_ring)
mq_size += ha->tgt.atio_q_length * sizeof(request_t);
/* Allocate memory for Fibre Channel Event Buffer. */
if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha))
OpenPOWER on IntegriCloud