Changeset 104580 in vbox

Timestamp:

May 13, 2024 8:48:29 AM (7 months ago)

Author:

vboxsync

Message:

Devies/Storage/VSCSI: Call scsiBE2H_U16() jsut once outside of RT_MIN() to avoid calling it twice (harmless, scsiBE2H_U16() has no side effects but a compiler might generate non-optimal code), missing call to vscsiDeviceReqComplete(), bugref:3409

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

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

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

@@ -83 +83 @@
             if (!vscsiDeviceLunIsPresent(pVScsiDevice, pVScsiReq->iLun))
             {
-                size_t cbData;
                 SCSIINQUIRYDATA ScsiInquiryReply;
 
+                uint16_t cbDataReq = scsiBE2H_U16(&pVScsiReq->pbCDB[3]);
                 vscsiReqSetXferDir(pVScsiReq, VSCSIXFERDIR_T2I);
-                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
+                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), cbDataReq));
                 memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
                 ScsiInquiryReply.cbAdditional = 31;
                 ScsiInquiryReply.u5PeripheralDeviceType = SCSI_INQUIRY_DATA_PERIPHERAL_DEVICE_TYPE_UNKNOWN;
                 ScsiInquiryReply.u3PeripheralQualifier = SCSI_INQUIRY_DATA_PERIPHERAL_QUALIFIER_NOT_CONNECTED_NOT_SUPPORTED;
-                cbData = RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA));
+                RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA));
                 *prcReq = vscsiReqSenseOkSet(&pVScsiDevice->VScsiSense, pVScsiReq);
             }

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

@@ -1104 +1104 @@
                 SCSIINQUIRYDATA ScsiInquiryReply;
 
+                uint16_t cbDataReq = scsiBE2H_U16(&pVScsiReq->pbCDB[3]);
                 vscsiReqSetXferDir(pVScsiReq, VSCSIXFERDIR_T2I);
-                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
+                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), cbDataReq));
                 memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
 

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

@@ -235 +235 @@
                     SCSIINQUIRYDATA ScsiInquiryReply;
 
-                    vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
+                    uint16_t cbDataReq = scsiBE2H_U16(&pVScsiReq->pbCDB[3]);
+                    vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), cbDataReq));
                     memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
 
@@ -558 +559 @@
 
                                 paRanges[i].offStart = scsiBE2H_U64(&abBlkDesc[0]) * 512;
-                                paRanges[i].cbRange = scsiBE2H_U32(&abBlkDesc[8]) * 512;
+                                paRanges[i].cbRange = (size_t)scsiBE2H_U32(&abBlkDesc[8]) * 512;
                             }
 
@@ -613 +614 @@
                     || enmTxDir == VSCSIIOREQTXDIR_FLUSH)
                 && (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_READONLY))
+            {
                 rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_DATA_PROTECT, SCSI_ASC_WRITE_PROTECTED, 0x00);
+                vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS);
+            }
             else
             {