Skip to contentSkip to conversation

scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()

PATCH Applied Andrea Parri (Microsoft) 2 participants 2 messages Nov 18, 2020 – Dec 1, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()

Check that the packet is of the expected size at least, don't copy data past the packet.

---
Based on hyperv-next.

 drivers/scsi/storvsc_drv.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/scsi/storvsc_drv.c +5 -0
index 331a33a04f1ad..629a46a0bab6e 100644
@@ -1270,6 +1270,11 @@ static void storvsc_on_channel_callback(void *context)
 
 		request = (struct storvsc_cmd_request *)(unsigned long)cmd_rqst;
 
+		if (hv_pkt_datalen(desc) < sizeof(struct vstor_packet) - vmscsi_size_delta) {
+			dev_err(&device->device, "Invalid packet len\n");
+			continue;
+		}
+
 		if (request == &stor_device->init_request ||
 		    request == &stor_device->reset_request) {
 			memcpy(&request->vstor_packet, packet,
Signature · 1 line
2.25.1
#1 lore raw
Quoted 2 lines · Andrea Parri (Microsoft)

Check that the packet is of the expected size at least, don't copy data past the packet.

Applied to 5.10/scsi-fixes, thanks!

[1/1] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()

      https://git.kernel.org/mkp/scsi/c/3b8c72d076c4
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering