Skip to content

Commit 19bc5f2

Browse files
Jiasheng Jiangmartinkpetersen
authored andcommitted
scsi: qla2xxx: Sanitize payload size to prevent member overflow
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: 875386b ("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>
1 parent 84dc603 commit 19bc5f2

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/scsi/qla2xxx/qla_isr.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,9 @@ qla27xx_copy_multiple_pkt(struct scsi_qla_host *vha, void **pkt,
878878
payload_size = sizeof(purex->els_frame_payload);
879879
}
880880

881+
if (total_bytes > sizeof(item->iocb.iocb))
882+
total_bytes = sizeof(item->iocb.iocb);
883+
881884
pending_bytes = total_bytes;
882885
no_bytes = (pending_bytes > payload_size) ? payload_size :
883886
pending_bytes;
@@ -1163,6 +1166,10 @@ qla27xx_copy_fpin_pkt(struct scsi_qla_host *vha, void **pkt,
11631166

11641167
total_bytes = (le16_to_cpu(purex->frame_size) & 0x0FFF)
11651168
- PURX_ELS_HEADER_SIZE;
1169+
1170+
if (total_bytes > sizeof(item->iocb.iocb))
1171+
total_bytes = sizeof(item->iocb.iocb);
1172+
11661173
pending_bytes = total_bytes;
11671174
entry_count = entry_count_remaining = purex->entry_count;
11681175
no_bytes = (pending_bytes > sizeof(purex->els_frame_payload)) ?

0 commit comments

Comments
 (0)