qla2xxx: Fix unbound NVME response length
Subsystems (2)
PATCH v3 1/1 qla2xxx: Fix unbound NVME response length
From: Arun Easi <[email protected]>
On certain cases when response length is less than 32, NVME response data is supplied inline in IOCB. This is indicated by some combination of state flags. There was an instance when a high, and incorrect, response length was indicated causing driver to overrun buffers. Fix this by checking and limiting the response payload length.
---
Hi Martin,
We discovered issue with our newer Gen7 adapter when response length happens to be larger than 32 bytes, could result into crash.
Please apply this to 5.5/scsi-fixes branch at your earliest convenience.
Changes from v2 -> v3
o Use "sizeof(struct nvme_fc_ersp_iu)" to indicate response payload size.
Changes from v1 -> v2
o Fixed the tag for stable.
o Removed logit which got spilled from other patch to prevent compile failure.
Thanks,
Himanshu
--- drivers/scsi/qla2xxx/qla_isr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/scsi/qla2xxx/qla_isr.c +9 -0
@@ -1939,6 +1939,15 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, inbuf = (uint32_t *)&sts->nvme_ersp_data; outbuf = (uint32_t *)fd->rspaddr; iocb->u.nvme.rsp_pyld_len =le16_to_cpu (sts->nvme_rsp_pyld_len); +if (unlikely (iocb->u.nvme.rsp_pyld_len >32 )) { +WARN_ONCE (1 ,"Unexpected response payload length %u.\n" , + iocb->u.nvme.rsp_pyld_len); +ql_log (ql_log_warn, fcport->vha,0x5100 , +"Unexpected response payload length %u.\n" , + iocb->u.nvme.rsp_pyld_len); + iocb->u.nvme.rsp_pyld_len = +sizeof (struct nvme_fc_ersp_iu ); + } iter = iocb->u.nvme.rsp_pyld_len >>2 ;for (; iter; iter--) *outbuf++ =swab32 (*inbuf++);
Signature · 1 line
2.12.0
Quoted 40 lines · Himanshu Madhani
From: Arun Easi <[email protected]>
On certain cases when response length is less than 32, NVME response data is supplied inline in IOCB. This is indicated by some combination of state flags. There was an instance when a high, and incorrect, response length was indicated causing driver to overrun buffers. Fix this by checking and limiting the response payload length.
Fixes 7401bc18d1ee3 ("scsi: qla2xxx: Add FC-NVMe command handling")Signed-off-by Arun Easi <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>---
Hi Martin,We discovered issue with our newer Gen7 adapter when response length happens to be larger than 32 bytes, could result into crash.
Please apply this to 5.5/scsi-fixes branch at your earliest convenience.
Changes from v2 -> v3
o Use "
sizeof(struct nvme_fc_ersp_iu)" to indicate response payload size.Changes from v1 -> v2
o Fixed the tag for stable.
o Removed logit which got spilled from other patch to prevent compile failure.Thanks,
Himanshu--- drivers/scsi/qla2xxx/qla_isr.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/scsi/qla2xxx/qla_isr.c +0
-0
drivers/scsi/qla2xxx/qla_isr.c static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, · line 1942
Quoted 4 lines
drivers/scsi/qla2xxx/qla_isr.c +1
-0@@ -1939,6 +1939,15 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, inbuf = (uint32_t *)&sts->nvme_ersp_data; outbuf = (uint32_t *)fd->rspaddr; iocb->u.nvme.rsp_pyld_len =le16_to_cpu (sts->nvme_rsp_pyld_len); +if (unlikely (iocb->u.nvme.rsp_pyld_len >32 )) {
I think this should have been "> sizeof(struct nvme_fc_ersp_iu)" as well.
-Ewan
Quoted 11 lines
drivers/scsi/qla2xxx/qla_isr.c +8
-0+WARN_ONCE (1 ,"Unexpected response payload length %u.\n" , + iocb->u.nvme.rsp_pyld_len); +ql_log (ql_log_warn, fcport->vha,0x5100 , +"Unexpected response payload length %u.\n" , + iocb->u.nvme.rsp_pyld_len); + iocb->u.nvme.rsp_pyld_len = +sizeof (struct nvme_fc_ersp_iu ); + } iter = iocb->u.nvme.rsp_pyld_len >>2 ;for (; iter; iter--) *outbuf++ =swab32 (*inbuf++);