Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: storage: Fix memory leak in USB bulk transport

A kernel memory leak was identified by the 'ioctl_sg01' test from Linux
Test Project (LTP). The following bytes were mainly observed: 0x53425355.

When USB storage devices incorrectly skip the data phase with status data,
the code extracts/validates the CSW from the sg buffer, but fails to clear
it afterwards. This leaves status protocol data in srb's transfer buffer,
such as the US_BULK_CS_SIGN 'USBS' signature observed here. Thus, this can
lead to USB protocols leaks to user space through SCSI generic (/dev/sg*)
interfaces, such as the one seen here when the LTP test requested 512 KiB.

Fix the leak by zeroing the CSW data in srb's transfer buffer immediately
after the validation of devices that skip data phase.

Note: Differently from CVE-2018-1000204, which fixed a big leak by zero-
ing pages at allocation time, this leak occurs after allocation, when USB
protocol data is written to already-allocated sg pages.

Fixes: a45b599ad808 ("scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()")
Cc: stable <stable@kernel.org>
Signed-off-by: Desnes Nunes <desnesn@redhat.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://patch.msgid.link/20251031043436.55929-1-desnesn@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Desnes Nunes and committed by
Greg Kroah-Hartman
41e99fe2 8c13a732

+16
+16
drivers/usb/storage/transport.c
··· 1200 1200 US_BULK_CS_WRAP_LEN && 1201 1201 bcs->Signature == 1202 1202 cpu_to_le32(US_BULK_CS_SIGN)) { 1203 + unsigned char buf[US_BULK_CS_WRAP_LEN]; 1204 + 1203 1205 usb_stor_dbg(us, "Device skipped data phase\n"); 1206 + 1207 + /* 1208 + * Devices skipping data phase might leave CSW data in srb's 1209 + * transfer buffer. Zero it to prevent USB protocol leakage. 1210 + */ 1211 + sg = NULL; 1212 + offset = 0; 1213 + memset(buf, 0, sizeof(buf)); 1214 + if (usb_stor_access_xfer_buf(buf, 1215 + US_BULK_CS_WRAP_LEN, srb, &sg, 1216 + &offset, TO_XFER_BUF) != 1217 + US_BULK_CS_WRAP_LEN) 1218 + usb_stor_dbg(us, "Failed to clear CSW data\n"); 1219 + 1204 1220 scsi_set_resid(srb, transfer_length); 1205 1221 goto skipped_data_phase; 1206 1222 }