Skip to contentSkip to conversation

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

PATCH Applied Andrea Parri (Microsoft) 3 participants 4 messages Dec 11, 2020

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

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

This reverts commit 3b8c72d076c42bf27284cda7b2b2b522810686f8.

Dexuan reported a regression where StorVSC fails to probe a device (and where, consequently, the VM may fail to boot). The root-cause analysis led to a long-standing race condition that is exposed by the validation /commit in question. Let's put the new validation aside until a proper solution for that race condition is in place.

Cc Dexuan Cui <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
---
 drivers/scsi/storvsc_drv.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/scsi/storvsc_drv.c +0 -5
index 99c8ff81de746..ded00a89bfc4e 100644
@@ -1246,11 +1246,6 @@ static void storvsc_on_channel_callback(void *context)
 		request = (struct storvsc_cmd_request *)
 			((unsigned long)desc->trans_id);
 
-		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
maintainer
#1 lore raw
Quoted 8 lines · Andrea Parri (Microsoft)

This reverts commit 3b8c72d076c42bf27284cda7b2b2b522810686f8.

Dexuan reported a regression where StorVSC fails to probe a device (and where, consequently, the VM may fail to boot). The root-cause analysis led to a long-standing race condition that is exposed by the validation /commit in question. Let's put the new validation aside until a proper solution for that race condition is in place.

Quoted 5 lines
Cc Dexuan Cui <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>

Hi Martin

Sorry for the last minute patch. We would very like this goes into 5.10 if possible; otherwise Linux 5.10 is going to be broken on Hyper-V. :-(

Wei.

#2 lore raw

Wei,

Quoted 3 lines

Sorry for the last minute patch. We would very like this goes into 5.10 if possible; otherwise Linux 5.10 is going to be broken on Hyper-V. :-(

Applied to 5.10/scsi-fixes.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
maintainer
#3 lore raw
Quoted 8 lines · Martin K. Petersen

Wei,

Quoted 3 lines

Sorry for the last minute patch. We would very like this goes into 5.10 if possible; otherwise Linux 5.10 is going to be broken on Hyper-V. :-(

Applied to 5.10/scsi-fixes.

Thanks Martin.