]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: qla2xxx: Sanitize payload size to prevent member overflow
authorJiasheng Jiang <jiashengjiangcool@gmail.com>
Tue, 6 Jan 2026 20:53:44 +0000 (20:53 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Jan 2026 09:27:36 +0000 (10:27 +0100)
[ Upstream commit 19bc5f2a6962dfaa0e32d0e0bc2271993d85d414 ]

In qla27xx_copy_fpin_pkt() and qla27xx_copy_multiple_pkt(), the frame_size
reported by firmware is used to calculate the copy length into
item->iocb. However, the iocb member is defined as a fixed-size 64-byte
array within struct purex_item.

If the reported frame_size exceeds 64 bytes, subsequent memcpy calls will
overflow the iocb member boundary. While extra memory might be allocated,
this cross-member write is unsafe and triggers warnings under
CONFIG_FORTIFY_SOURCE.

Fix this by capping total_bytes to the size of the iocb member (64 bytes)
before allocation and copying. This ensures all copies remain within the
bounds of the destination structure member.

Fixes: 875386b98857 ("scsi: qla2xxx: Add Unsolicited LS Request and Response Support for NVMe")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
Reviewed-by: Himanshu Madhani <hmadhani2024@gmail.com>
Link: https://patch.msgid.link/20260106205344.18031-1-jiashengjiangcool@gmail.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/qla2xxx/qla_isr.c

index a85d3a40ee49025609187165538e17df04565db7..ae2bea27a18a67c3381a453b16aab13ec81eb94e 100644 (file)
@@ -878,6 +878,9 @@ qla27xx_copy_multiple_pkt(struct scsi_qla_host *vha, void **pkt,
                payload_size = sizeof(purex->els_frame_payload);
        }
 
+       if (total_bytes > sizeof(item->iocb.iocb))
+               total_bytes = sizeof(item->iocb.iocb);
+
        pending_bytes = total_bytes;
        no_bytes = (pending_bytes > payload_size) ? payload_size :
                   pending_bytes;
@@ -1163,6 +1166,10 @@ qla27xx_copy_fpin_pkt(struct scsi_qla_host *vha, void **pkt,
 
        total_bytes = (le16_to_cpu(purex->frame_size) & 0x0FFF)
            - PURX_ELS_HEADER_SIZE;
+
+       if (total_bytes > sizeof(item->iocb.iocb))
+               total_bytes = sizeof(item->iocb.iocb);
+
        pending_bytes = total_bytes;
        entry_count = entry_count_remaining = purex->entry_count;
        no_bytes = (pending_bytes > sizeof(purex->els_frame_payload))  ?