scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
authorAndrea Parri (Microsoft) <parri.andrea@gmail.com>
Thu, 17 Dec 2020 20:33:21 +0000 (21:33 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 8 Jan 2021 04:15:24 +0000 (23:15 -0500)
Check that the packet is of the expected size at least, don't copy data
past the packet.

Link: https://lore.kernel.org/r/20201217203321.4539-4-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
Reported-by: Saruhan Karademir <skarade@microsoft.com>
Reviewed-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/storvsc_drv.c

index e221aba..f0fa42f 100644 (file)
@@ -1265,6 +1265,12 @@ 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) -
+                               stor_device->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,