Changeset 51042 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Apr 10, 2014 8:05:24 PM (11 years ago)

Author:

vboxsync

Message:

wddm/DevVGA: complex command submission; bugfixes

File:

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

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

@@ -1557 +1557 @@
         case VBOXCMDVBVA_OPTYPE_SYSMEMCMD:
         {
+            if (cbCmd < sizeof (VBOXCMDVBVA_SYSMEMCMD))
+            {
+                WARN(("invalid command size"));
+                return -1;
+            }
             VBOXCMDVBVA_SYSMEMCMD *pSysmemCmd = (VBOXCMDVBVA_SYSMEMCMD*)pCmd;
             const VBOXCMDVBVA_HDR *pRealCmdHdr;
@@ -1700 +1705 @@
             PDMDevHlpPhysReleasePageMappingLock(pDevIns, &Lock);
             return i8Result;
+        }
+        case VBOXCMDVBVA_OPTYPE_COMPLEXCMD:
+        {
+            Assert(cbCmd >= sizeof (VBOXCMDVBVA_HDR));
+            ++pCmd;
+            cbCmd -= sizeof (*pCmd);
+            uint32_t cbCurCmd = 0;
+            for ( ; cbCmd; cbCmd -= cbCurCmd, pCmd = (VBOXCMDVBVA_HDR*)(((uint8_t*)pCmd) + cbCurCmd))
+            {
+                if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
+                {
+                    WARN(("invalid command size"));
+                    return -1;
+                }
+
+                cbCurCmd = pCmd->u32FenceID;
+                if (cbCmd < cbCurCmd)
+                {
+                    WARN(("invalid command size"));
+                    return -1;
+                }
+
+                int8_t i8Result = vboxVDMACrCmdVbvaProcess(pVdma, pCmd, cbCurCmd);
+                if (i8Result < 0)
+                {
+                    WARN(("vboxVDMACrCmdVbvaProcess failed"));
+                    return i8Result;
+                }
+            }
+            return 0;
         }
         default: