* [PATCH] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
@ 2020-11-18 14:53 Andrea Parri (Microsoft)
2020-12-01 6:06 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Andrea Parri (Microsoft) @ 2020-11-18 14:53 UTC (permalink / raw)
To: linux-kernel
Cc: K . Y . Srinivasan, Haiyang Zhang, Stephen Hemminger, Wei Liu,
linux-hyperv, Michael Kelley, Juan Vazquez, Saruhan Karademir,
Andrea Parri (Microsoft),
James E.J. Bottomley, Martin K. Petersen, linux-scsi
Check that the packet is of the expected size at least, don't copy
data past the packet.
Reported-by: Saruhan Karademir <skarade@microsoft.com>
Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
2020-11-18 14:53 [PATCH] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback() Andrea Parri (Microsoft)
@ 2020-12-01 6:06 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2020-12-01 6:06 UTC (permalink / raw)
To: Andrea Parri (Microsoft), linux-kernel
Cc: Martin K . Petersen, Stephen Hemminger, Haiyang Zhang,
Juan Vazquez, Saruhan Karademir, Michael Kelley,
K . Y . Srinivasan, James E.J. Bottomley, linux-hyperv,
linux-scsi, Wei Liu
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-01 6:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-18 14:53 [PATCH] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback() Andrea Parri (Microsoft)
2020-12-01 6:06 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®