Changeset 70873 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib

Timestamp:

Feb 5, 2018 6:13:55 PM (7 years ago)

Author:

vboxsync

Message:

VMMDev,VBoxGuest: Classify who is calling the host (part 1). bugref:9105

Location:

trunk/src/VBox/Additions/common/VBoxGuest/lib

Files:

• VBoxGuestR0LibGenericRequest.cpp (modified) (1 diff)
• VBoxGuestR0LibHGCMInternal.cpp (modified) (11 diffs)
• VBoxGuestR3LibGR.cpp (modified) (1 diff)

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

@@ -127 +127 @@
             pReq->rc          = VERR_GENERAL_FAILURE;
             pReq->reserved1   = 0;
-            pReq->reserved2   = 0;
+#ifdef VBGL_VBOXGUEST
+            pReq->fRequestor  = VMMDEV_REQUESTOR_KERNEL        | VMMDEV_REQUESTOR_USR_DRV
+#else
+            pReq->fRequestor  = VMMDEV_REQUESTOR_KERNEL        | VMMDEV_REQUESTOR_USR_DRV_OTHER
+#endif
 
+                              | VMMDEV_REQUESTOR_CON_DONT_KNOW | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
             *ppReq = pReq;
             rc = VINF_SUCCESS;

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

@@ -84 +84 @@
 /* These functions can be only used by VBoxGuest. */
 
-DECLR0VBGL(int) VbglR0HGCMInternalConnect(HGCMServiceLocation const *pLoc, HGCMCLIENTID *pidClient,
+DECLR0VBGL(int) VbglR0HGCMInternalConnect(HGCMServiceLocation const *pLoc, uint32_t fRequestor, HGCMCLIENTID *pidClient,
                                           PFNVBGLHGCMCALLBACK pfnAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -98 +98 @@
         {
             /* Initialize request memory */
+            pHGCMConnect->header.header.fRequestor = fRequestor;
+
             pHGCMConnect->header.fu32Flags = 0;
 
@@ -127 +129 @@
 
 
-DECLR0VBGL(int) VbglR0HGCMInternalDisconnect(HGCMCLIENTID idClient,
+DECLR0VBGL(int) VbglR0HGCMInternalDisconnect(HGCMCLIENTID idClient, uint32_t fRequestor,
                                              PFNVBGLHGCMCALLBACK pfnAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -140 +142 @@
         {
             /* Initialize request memory */
+            pHGCMDisconnect->header.header.fRequestor = fRequestor;
+
             pHGCMDisconnect->header.fu32Flags = 0;
 
@@ -471 +475 @@
  * @param   pCallInfo       The call info.
  * @param   cbCallInfo      The size of the call info structure.
+ * @param   fRequestor      VMMDEV_REQUESTOR_XXX.
  * @param   fIsUser         Is it a user request or kernel request.
  * @param   pcbExtra        Where to return the extra request space needed for
@@ -476 +481 @@
  */
 static void vbglR0HGCMInternalInitCall(VMMDevHGCMCall *pHGCMCall, PCVBGLIOCHGCMCALL pCallInfo,
-                                       uint32_t cbCallInfo, bool fIsUser, struct VbglR0ParmInfo *pParmInfo)
+                                       uint32_t cbCallInfo, uint32_t fRequestor, bool fIsUser, struct VbglR0ParmInfo *pParmInfo)
 {
     HGCMFunctionParameter const *pSrcParm = VBGL_HGCM_GET_CALL_PARMS(pCallInfo);
@@ -492 +497 @@
      * The call request headers.
      */
+    pHGCMCall->header.header.fRequestor = !fIsUser || (fRequestor & VMMDEV_REQUESTOR_USERMODE) ? fRequestor
+                                        :   VMMDEV_REQUESTOR_USERMODE        | VMMDEV_REQUESTOR_USR_NOT_GIVEN
+                                          | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN | VMMDEV_REQUESTOR_CON_DONT_KNOW;
+
     pHGCMCall->header.fu32Flags = 0;
     pHGCMCall->header.result    = VINF_SUCCESS;
@@ -855 +864 @@
 
 
-DECLR0VBGL(int) VbglR0HGCMInternalCall(PVBGLIOCHGCMCALL pCallInfo, uint32_t cbCallInfo, uint32_t fFlags,
+DECLR0VBGL(int) VbglR0HGCMInternalCall(PVBGLIOCHGCMCALL pCallInfo, uint32_t cbCallInfo, uint32_t fFlags, uint32_t fRequestor,
                                        PFNVBGLHGCMCALLBACK pfnAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -896 +905 @@
         {
             bool fLeakIt;
-            vbglR0HGCMInternalInitCall(pHGCMCall, pCallInfo, cbCallInfo, fIsUser, &ParmInfo);
+            vbglR0HGCMInternalInitCall(pHGCMCall, pCallInfo, cbCallInfo, fRequestor, fIsUser, &ParmInfo);
 
             /*
@@ -944 +953 @@
 
 #if ARCH_BITS == 64
-DECLR0VBGL(int) VbglR0HGCMInternalCall32(PVBGLIOCHGCMCALL pCallInfo, uint32_t cbCallInfo, uint32_t fFlags,
+DECLR0VBGL(int) VbglR0HGCMInternalCall32(PVBGLIOCHGCMCALL pCallInfo, uint32_t cbCallInfo, uint32_t fFlags, uint32_t fRequestor,
                                          PFNVBGLHGCMCALLBACK pfnAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -1018 +1027 @@
     {
         rc = VbglR0HGCMInternalCall(pCallInfo64, sizeof(*pCallInfo64) + cParms * sizeof(HGCMFunctionParameter), fFlags,
-                                    pfnAsyncCallback, pvAsyncData, u32AsyncData);
+                                    fRequestor, pfnAsyncCallback, pvAsyncData, u32AsyncData);
 
         if (RT_SUCCESS(rc))

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

@@ -52 +52 @@
         pReq->rc          = VERR_GENERAL_FAILURE;
         pReq->reserved1   = 0;
-        pReq->reserved2   = 0;
+        pReq->fRequestor  = 0;
 
         *ppReq = pReq;