Changeset 71893 in vbox for trunk/src/VBox

Timestamp:

Apr 18, 2018 10:55:06 AM (7 years ago)

Author:

vboxsync

Message:

DevVGA: Code cleanup in progress. bugref:9094

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -2720 +2720 @@
  *                      be set to true.
  */
-static int vboxVDMACmdExec(PVBOXVDMAHOST pVdma, const uint8_t *pbBuffer, uint32_t cbBuffer,
+static int vboxVDMACmdExec(PVBOXVDMAHOST pVdma, uint8_t const RT_UNTRUSTED_VOLATILE_GUEST *pbBuffer, uint32_t cbBuffer,
                            VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_GUEST *pCmdDr, bool *pfAsyncCmd)
 {
@@ -2729 +2729 @@
         AssertReturn(cbBuffer >= VBOXVDMACMD_HEADER_SIZE(), VERR_INVALID_PARAMETER);
 
-        VBOXVDMACMD const  *pCmd       = (VBOXVDMACMD const *)pbBuffer;
-        VBOXVDMACMD_TYPE    enmCmdType = pCmd->enmType;
-        int                 cbProcessed;
+        VBOXVDMACMD const RT_UNTRUSTED_VOLATILE_GUEST  *pCmd       = (VBOXVDMACMD const RT_UNTRUSTED_VOLATILE_GUEST *)pbBuffer;
+        VBOXVDMACMD_TYPE                                enmCmdType = pCmd->enmType;
+        RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
+
+        ASSERT_GUEST_MSG_RETURN(   enmCmdType == VBOXVDMACMD_TYPE_CHROMIUM_CMD
+                                || enmCmdType == VBOXVDMACMD_TYPE_DMA_PRESENT_BLT
+                                || enmCmdType == VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER
+                                || enmCmdType == VBOXVDMACMD_TYPE_DMA_NOP
+                                || enmCmdType == VBOXVDMACMD_TYPE_CHILD_STATUS_IRQ,
+                                ("enmCmdType=%d\n", enmCmdType),
+                                VERR_INVALID_FUNCTION);
+        RT_UNTRUSTED_VALIDATED_FENCE();
+
+        int cbProcessed;
         switch (enmCmdType)
         {
@@ -2917 +2928 @@
      * Process the command.
      */
-    int rc = vboxVDMACmdExec(pVdma, (uint8_t const *)pbCmdBuf, cbCmdBuf, pCmd, pfAsyncCmd); /** @todo fixme later */
+    int rc = vboxVDMACmdExec(pVdma, pbCmdBuf, cbCmdBuf, pCmd, pfAsyncCmd);
     AssertRC(rc);