Changeset 81231 in vbox

Timestamp:

Oct 13, 2019 12:59:17 PM (5 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioScsi.cpp: Disabled MSI-X and added guards to virtioScsioReqCopy*() functions. See bugref:9440 Comment 108

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevVirtioSCSI.cpp (modified) (2 diffs)
• VirtIO/Virtio_1_0.cpp (modified) (2 diffs)

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

@@ -696 +696 @@
     RT_NOREF2(hIoReq, pInterface);
     PVIRTIOSCSIREQ pReq = (PVIRTIOSCSIREQ)pvIoReqAlloc;
-    if (pReq->pbDataIn)
-        RTSgBufCopyToBuf(pSgBuf, pReq->pbDataIn + offDst, cbCopy);
+
+    AssertReturn(pReq->pbDataIn
+                 && offDst + cbCopy <= pReq->cbDataIn
+                 && cbCopy <= pSgBuf->cbSegLeft,  VERR_INVALID_PARAMETER);
+
+    RTSgBufCopyToBuf(pSgBuf, pReq->pbDataIn + offDst, cbCopy);
+
     return VINF_SUCCESS;
 }
@@ -709 +714 @@
     RT_NOREF2(hIoReq, pInterface);
     PVIRTIOSCSIREQ pReq = (PVIRTIOSCSIREQ)pvIoReqAlloc;
-    if (pReq->pbDataOut)
-        RTSgBufCopyFromBuf(pSgBuf, pReq->pbDataOut + offSrc, cbCopy);
+
+    AssertReturn(pReq->pbDataOut
+                 && offSrc + cbCopy <= pReq->cbDataOut
+                 && cbCopy <= pSgBuf->cbSegLeft,  VERR_INVALID_PARAMETER);
+
+    RTSgBufCopyFromBuf(pSgBuf, pReq->pbDataOut + offSrc, cbCopy);
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -108 +108 @@
 int virtioQueueGet(VIRTIOHANDLE hVirtio, uint16_t qIdx, PPVIRTIO_DESC_CHAIN_T ppDescChain,  bool fRemove)
 {
-    Assert(ppDescChain);
+    AssertReturn(ppDescChain, VERR_INVALID_PARAMETER);
 
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
@@ -1040 +1040 @@
     }
 
-#ifdef VBOX_WITH_MSI_DEVICES
+#if 0 /* Until pdmR3DvHlp_PCISetIrq() impl is fixed and Assert that limits vec to 0 is removed */
+# ifdef VBOX_WITH_MSI_DEVICES
     pVirtio->fMsiSupport = true;
+# endif
 #endif