Changeset 75771 in vbox

Timestamp:

Nov 27, 2018 12:53:36 PM (6 years ago)

Author:

vboxsync

Message:

VMMDev,HGCM: Give access to VMMDevRequestHeader::fRequestor. [adjustments] bugref:9105

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (1 diff)
• include/VBox/hgcmsvc.h (modified) (1 diff)
• include/VBox/vmm/pdmifs.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (1 diff)
• src/VBox/Main/src-client/HGCM.cpp (modified) (1 diff)

trunk/include/VBox/VMMDev.h

@@ -332 +332 @@
  * @internal Host only. */
 #define VMMDEV_REQUESTOR_LEGACY                     UINT32_MAX
+/** Lowest conceivable trust level, for error situations of getters.
+ * @internal Host only. */
+#define VMMDEV_REQUESTOR_LOWEST                     (  VMMDEV_REQUESTOR_TRUST_UNTRUSTED | VMMDEV_REQUESTOR_USER_DEVICE \
+                                                     | VMMDEV_REQUESTOR_CON_NO | VMMDEV_REQUESTOR_USERMODE \
+                                                     | VMMDEV_REQUESTOR_USR_GUEST)
 /** Used on the host to check whether a requestor value is present or not. */
 #define VMMDEV_REQUESTOR_IS_PRESENT(a_fRequestor)   ((a_fRequestor) != VMMDEV_REQUESTOR_LEGACY)

trunk/include/VBox/hgcmsvc.h

@@ -115 +115 @@
      * Retrieves the VMMDevRequestHeader::fRequestor value.
      *
-     * @returns The field value, 0 if invalid call.
+     * @returns The field value, VMMDEV_REQUESTOR_LEGACY if not supported by the
+     *          guest, VMMDEV_REQUESTOR_LOWEST if invalid call.
      * @param   hCall       The call we're checking up on.
      */

trunk/include/VBox/vmm/pdmifs.h

@@ -2087 +2087 @@
      * Gets the VMMDevRequestHeader::fRequestor value for @a pCmd.
      *
-     * @returns The fRequestor value, 0 if invalid parameters.
+     * @returns The fRequestor value, VMMDEV_REQUESTOR_LEGACY if guest does not
+     *          support it, VMMDEV_REQUESTOR_LOWEST if invalid parameters.
      * @param   pInterface          Pointer to this interface.
      * @param   pCmd                The command we're in checking on.

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -1541 +1541 @@
 {
     PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDevState, IHGCMPort);
+    AssertPtrReturn(pCmd, VMMDEV_REQUESTOR_LOWEST);
     if (pThis->guestInfo2.fFeatures & VBOXGSTINFO2_F_REQUESTOR_INFO)
-        if (pCmd)
-            return pCmd->fRequestor;
-   return 0;
+        return pCmd->fRequestor;
+   return VMMDEV_REQUESTOR_LEGACY;
 }
 

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -896 +896 @@
 {
     HGCMMsgHeader *pMsgHdr = (HGCMMsgHeader *)(hCall);
-    AssertPtrReturn(pMsgHdr, 0);
+    AssertPtrReturn(pMsgHdr, VMMDEV_REQUESTOR_LOWEST);
 
     PVBOXHGCMCMD pCmd = pMsgHdr->pCmd;
-    AssertPtrReturn(pCmd, 0);
+    AssertPtrReturn(pCmd, VMMDEV_REQUESTOR_LOWEST);
 
     PPDMIHGCMPORT pHgcmPort = pMsgHdr->pHGCMPort;
-    AssertPtrReturn(pHgcmPort, 0);
+    AssertPtrReturn(pHgcmPort, VMMDEV_REQUESTOR_LOWEST);
 
     return pHgcmPort->pfnGetRequestor(pHgcmPort, pCmd);