Changeset 40483 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 15, 2012 2:20:20 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: don't use VBoxGuest device to comply woth Metro apps security

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/VBoxGuest.cpp (modified) (6 diffs)
• VBoxGuestLib/HGCM.cpp (modified) (1 diff)
• VBoxGuestLib/Makefile.kmk (modified) (1 diff)
• VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp (added)
• VBoxGuestLib/VBoxGuestR0LibCrOgl.h (added)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1893 +1893 @@
                                          PVBOXGUESTSESSION pSession,
                                          VBoxGuestHGCMCallInfo *pInfo,
-                                         uint32_t cMillies, bool fInterruptible, bool f32bit,
+                                         uint32_t cMillies, bool fInterruptible, bool f32bit, bool fUserData,
                                          size_t cbExtra, size_t cbData, size_t *pcbDataReturned)
 {
@@ -1949 +1949 @@
      */
     Log(("VBoxGuestCommonIOCtl: HGCM_CALL: u32Client=%RX32\n", pInfo->u32ClientID));
-    fFlags = pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER;
+    fFlags = !fUserData && pSession->R0Process == NIL_RTR0PROCESS ? VBGLR0_HGCMCALL_F_KERNEL : VBGLR0_HGCMCALL_F_USER;
 #ifdef RT_ARCH_AMD64
     if (f32bit)
@@ -2449 +2449 @@
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
-                                           fInterruptible, false /*f32bit*/,
+                                           fInterruptible, false /*f32bit*/, false /* fUserData */,
                                            0, cbData, pcbDataReturned);
     }
@@ -2458 +2458 @@
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, &pInfo->info, pInfo->u32Timeout,
                                            !!pInfo->fInterruptible || pSession->R0Process != NIL_RTR0PROCESS,
-                                           false /*f32bit*/,
+                                           false /*f32bit*/, false /* fUserData */,
                                            RT_OFFSETOF(VBoxGuestHGCMCallInfoTimed, info), cbData, pcbDataReturned);
+    }
+    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(0)))
+    {
+        bool fInterruptible = true;
+        CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
+        rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
+                                           fInterruptible, false /*f32bit*/, true /* fUserData */,
+                                           0, cbData, pcbDataReturned);
     }
 # ifdef RT_ARCH_AMD64
@@ -2467 +2475 @@
         CHECKRET_MIN_SIZE("HGCM_CALL", sizeof(VBoxGuestHGCMCallInfo));
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, (VBoxGuestHGCMCallInfo *)pvData, RT_INDEFINITE_WAIT,
-                                           fInterruptible, true /*f32bit*/,
+                                           fInterruptible, true /*f32bit*/, false /* fUserData */,
                                            0, cbData, pcbDataReturned);
     }
@@ -2476 +2484 @@
         rc = VBoxGuestCommonIOCtl_HGCMCall(pDevExt, pSession, &pInfo->info, pInfo->u32Timeout,
                                            !!pInfo->fInterruptible || pSession->R0Process != NIL_RTR0PROCESS,
-                                           true /*f32bit*/,
+                                           true /*f32bit*/, false /* fUserData */,
                                            RT_OFFSETOF(VBoxGuestHGCMCallInfoTimed, info), cbData, pcbDataReturned);
     }

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -198 +198 @@
 }
 
+DECLVBGL(int) VbglHGCMCallUserData (VBGLHGCMHANDLE handle, VBoxGuestHGCMCallInfo *pData, uint32_t cbData)
+{
+    int rc = VINF_SUCCESS;
+
+    VBGL_HGCM_ASSERTMsg(cbData >= sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (HGCMFunctionParameter),
+                        ("cbData = %d, cParms = %d (calculated size %d)\n", cbData, pData->cParms, sizeof (VBoxGuestHGCMCallInfo) + pData->cParms * sizeof (VBoxGuestHGCMCallInfo)));
+
+    rc = vbglDriverIOCtl (&handle->driver, VBOXGUEST_IOCTL_HGCM_CALL_USERDATA(cbData), pData, cbData);
+
+    return rc;
+}
+
+
 DECLVBGL(int) VbglHGCMCallTimed (VBGLHGCMHANDLE handle,
                                  VBoxGuestHGCMCallInfoTimed *pData, uint32_t cbData)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -64 +64 @@
         HGCM.cpp \
         VBoxGuestR0LibSharedFolders.c \
+        VBoxGuestR0LibCrOgl.cpp \
         VbglR0CanUsePhysPageList.cpp