Changeset 80541 in vbox

Timestamp:

Sep 2, 2019 7:55:16 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133048

Message:

VSCSI: Fix the amount of transfered data for INQUIRY requests to actually indicate how much was transfered really

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIDevice.cpp (modified) (1 diff)
• VSCSILunMmc.cpp (modified) (1 diff)
• VSCSILunSbc.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp

@@ -67 +67 @@
                 SCSIINQUIRYDATA ScsiInquiryReply;
 
-                vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3]));
+                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
                 memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
                 ScsiInquiryReply.cbAdditional = 31;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -1093 +1093 @@
                 SCSIINQUIRYDATA ScsiInquiryReply;
 
-                vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3]));
+                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
                 memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -201 +201 @@
         case SCSI_INQUIRY:
         {
-            vscsiReqSetXferSize(pVScsiReq, scsiBE2H_U16(&pVScsiReq->pbCDB[3]));
+            vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
 
             /* Check for EVPD bit. */