Changeset 85994 in vbox for trunk/src

Timestamp:

Sep 2, 2020 11:06:04 AM (4 years ago)

Author:

vboxsync

Message:

Devices/Storage/DevLsiLogicSCSI: Don't copy the sense buffer over if the guest has no sense buffer allocated, fixes debug assertion with the EFI MPT driver

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -2155 +2155 @@
 
         /* Copy the sense buffer over. */
-        PDMDevHlpPCIPhysWriteMeta(pDevIns, GCPhysAddrSenseBuffer, pReq->abSenseBuffer,
-                                  RT_UNLIKELY(  pReq->GuestRequest.SCSIIO.u8SenseBufferLength
-                                              < sizeof(pReq->abSenseBuffer))
-                                  ? pReq->GuestRequest.SCSIIO.u8SenseBufferLength
-                                  : sizeof(pReq->abSenseBuffer));
+        if (pReq->GuestRequest.SCSIIO.u8SenseBufferLength > 0)
+            PDMDevHlpPCIPhysWriteMeta(pDevIns, GCPhysAddrSenseBuffer, pReq->abSenseBuffer,
+                                      RT_UNLIKELY(  pReq->GuestRequest.SCSIIO.u8SenseBufferLength
+                                                  < sizeof(pReq->abSenseBuffer))
+                                      ? pReq->GuestRequest.SCSIIO.u8SenseBufferLength
+                                      : sizeof(pReq->abSenseBuffer));
 
         if (RT_SUCCESS(rcReq) && RT_LIKELY(pReq->u8ScsiSts == SCSI_STATUS_OK))