Changeset 21268 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

Timestamp:

Jul 6, 2009 6:35:30 PM (15 years ago)

Author:

vboxsync

Message:

HGCMInternal.cpp,SysHlp.cpp: use the kernel/user mode indicator.

File:

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

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

@@ -169 +169 @@
                 switch (pParm->type)
                 {
+                case VMMDevHGCMParmType_32bit:
+                case VMMDevHGCMParmType_64bit:
+                    break;
+
+                case VMMDevHGCMParmType_PhysAddr:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    break;
+
                 case VMMDevHGCMParmType_LinAddr_Locked_In:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_In;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_In;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked_Out:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_Out;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_Out;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked:
-                    pParm->type = VMMDevHGCMParmType_LinAddr;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr;
                     break;
 
@@ -190 +208 @@
                        These kind of problems actually applies to some patched linux kernels too, including older
                        fedora releases. (The patch is the infamous 4G/4G patch, aka 4g4g, by Ingo Molnar.) */
-                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size, (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */);
-                    break;
+                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size,
+                                         (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */,
+                                         fFlags);
+                    break;
+
                 default:
-                    /* make gcc happy */
+                    rc = VERR_INVALID_PARAMETER;
                     break;
                 }
@@ -333 +354 @@
                 switch (pParm->type)
                 {
+                case VMMDevHGCMParmType_32bit:
+                case VMMDevHGCMParmType_64bit:
+                    break;
+
+                case VMMDevHGCMParmType_PhysAddr:
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    break;
+
                 case VMMDevHGCMParmType_LinAddr_Locked_In:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_In;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_In;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked_Out:
-                    pParm->type = VMMDevHGCMParmType_LinAddr_Out;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr_Out;
                     break;
                 case VMMDevHGCMParmType_LinAddr_Locked:
-                    pParm->type = VMMDevHGCMParmType_LinAddr;
+                    if ((fFlags & VBGLR0_HGCMCALL_F_MODE_MASK) == VBGLR0_HGCMCALL_F_USER)
+                        rc = VERR_INVALID_PARAMETER;
+                    else
+                        pParm->type = VMMDevHGCMParmType_LinAddr;
                     break;
 
@@ -354 +393 @@
                        These kind of problems actually applies to some patched linux kernels too, including older
                        fedora releases. (The patch is the infamous 4G/4G patch, aka 4g4g, by Ingo Molnar.) */
-                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size, (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */);
-                    break;
+                    rc = vbglLockLinear (&apvCtx[iParm], (void *)pParm->u.Pointer.u.linearAddr, pParm->u.Pointer.size,
+                                         (pParm->type == VMMDevHGCMParmType_LinAddr_In) ? false : true /* write access */,
+                                         fFlags);
+                    break;
+
                 default:
-                    /* make gcc happy */
+                    rc = VERR_INVALID_PARAMETER;
                     break;
                 }