2020-11-18 14:55:54

by Andrea Parri

Subject: [PATCH] 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.

Reported-by: Saruhan Karademir <[email protected]>
Signed-off-by: Andrea Parri (Microsoft) <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: [email protected]
---
Based on hyperv-next.

drivers/scsi/storvsc_drv.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 331a33a04f1ad..629a46a0bab6e 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -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,
--
2.25.1

2020-12-01 06:10:53

by Martin K. Petersen

Subject: Re: [PATCH] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()

On Wed, 18 Nov 2020 15:53:48 +0100, Andrea Parri (Microsoft) wrote:

> 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

--
Martin K. Petersen Oracle Linux Engineering