Changeset 21456 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jul 9, 2009 8:09:23 PM (15 years ago)

Author:

vboxsync

Message:

HGCM&Co: physical page list.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp (modified) (6 diffs)

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

@@ -122 +122 @@
 
 /** @todo merge with the one below (use a header file). Too lazy now. */
-DECLR0VBGL(int) VbglR0HGCMInternalCall (VBoxGuestHGCMCallInfo *pCallInfo, uint32_t fFlags,
+DECLR0VBGL(int) VbglR0HGCMInternalCall (VBoxGuestHGCMCallInfo *pCallInfo, uint32_t cbCallInfo, uint32_t fFlags,
                                         VBGLHGCMCALLBACK *pAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -140 +140 @@
     pHGCMCall = NULL;
 
-    cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter);
+    if (cbCallInfo == 0)
+    {
+        /* Caller did not specify the size (a valid value should be at least sizeof(VBoxGuestHGCMCallInfo)).
+         * Compute the size.
+         */
+        cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter32);
+    }
+    else if (cbCallInfo < sizeof (VBoxGuestHGCMCallInfo))
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+    else
+    {
+        cbParms = cbCallInfo - sizeof (VBoxGuestHGCMCallInfo);
+    }
 
     /* Allocate request */
@@ -195 +209 @@
                     else
                         pParm->type = VMMDevHGCMParmType_LinAddr;
+                    break;
+
+                case VMMDevHGCMParmType_PageList:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
                     break;
 
@@ -307 +326 @@
 # if ARCH_BITS == 64
 /** @todo merge with the one above (use a header file). Too lazy now. */
-DECLR0VBGL(int) VbglR0HGCMInternalCall32 (VBoxGuestHGCMCallInfo *pCallInfo, uint32_t fFlags,
+DECLR0VBGL(int) VbglR0HGCMInternalCall32 (VBoxGuestHGCMCallInfo *pCallInfo, uint32_t cbCallInfo, uint32_t fFlags,
                                           VBGLHGCMCALLBACK *pAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData)
 {
@@ -325 +344 @@
     pHGCMCall = NULL;
 
-    cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter32);
+    if (cbCallInfo == 0)
+    {
+        /* Caller did not specify the size (a valid value should be at least sizeof(VBoxGuestHGCMCallInfo)).
+         * Compute the size.
+         */
+        cbParms = pCallInfo->cParms * sizeof (HGCMFunctionParameter32);
+    }
+    else if (cbCallInfo < sizeof (VBoxGuestHGCMCallInfo))
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+    else
+    {
+        cbParms = cbCallInfo - sizeof (VBoxGuestHGCMCallInfo);
+    }
 
     /* Allocate request */
@@ -380 +413 @@
                     else
                         pParm->type = VMMDevHGCMParmType_LinAddr;
+                    break;
+
+                case VMMDevHGCMParmType_PageList:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
                     break;