Changeset 6978 in vbox

Timestamp:

Feb 18, 2008 7:55:14 AM (17 years ago)

Author:

vboxsync

Message:

Additions/Linux: switch the VBOXGUEST_IOCTL_NR ioctl to VBOXGUEST_IOCTL_STRIP_SIZE

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (3 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -993 +993 @@
 # define VBOXGUEST_IOCTL_CODE(Function, Size)   _IOC(_IOC_READ|_IOC_WRITE, 'V', (Function) | VBOXGUEST_IOCTL_FLAG, (Size))
 # define VBOXGUEST_IOCTL_CODE_FAST(Function)    _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG)
-# define VBOXGUEST_IOCTL_STRIP_SIZE(Function)   ((Function) - _IOC_SIZE((Function)))
-
-/** @todo r=bird: Please remove. See discussion in xTracker and elsewhere; VBOXGUEST_IOCTL_STRIP_SIZE is all we need here and it must be defined everywhere. */
-# define VBOXGUEST_IOCTL_NUMBER(Code)           (_IOC_NR((Code)) & ~VBOXGUEST_IOCTL_FLAG)
+# define VBOXGUEST_IOCTL_STRIP_SIZE(Code)       VBOXGUEST_IOCTL_CODE(_IOC_NR((Code)), 0)
 # define VBOXGUEST_IOCTL_SIZE(Code)             (_IOC_SIZE((Code)))
 

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -355 +355 @@
 
         /* Deal with variable size ioctls first. */
-        if (VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_LOG(0)) == VBOXGUEST_IOCTL_NUMBER(cmd)) {
+        if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0))
+            == VBOXGUEST_IOCTL_STRIP_SIZE(cmd)) {
                 char *pszMessage = kmalloc(VBOXGUEST_IOCTL_SIZE(cmd), GFP_KERNEL);
                 if (NULL == pszMessage) {
@@ -376 +377 @@
         }
 
-        if (   VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_VMMREQUEST(0))
-            == VBOXGUEST_IOCTL_NUMBER(cmd))  {
+        if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_VMMREQUEST(0))
+            == VBOXGUEST_IOCTL_STRIP_SIZE(cmd))  {
             VMMDevRequestHeader reqHeader;
             VMMDevRequestHeader *reqFull = NULL;
@@ -453 +454 @@
             VbglGRFree(reqFull);
             return rc;
+        }
+
+        if (   VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_HGCM_CALL(0))
+            == VBOXGUEST_IOCTL_STRIP_SIZE(cmd)) {
+        /* This IOCTL allows the guest to make an HGCM call from user space.  The
+           OS-independant part of the Guest Additions already contain code for making an
+           HGCM call from the guest, but this code assumes that the call is made from the
+           kernel's address space.  So before calling it, we have to copy all parameters
+           to the HGCM call from user space to kernel space and reconstruct the structures
+           passed to the call (which include pointers to other memory) inside the kernel's
+           address space. */
+                return vbox_ioctl_hgcm_call(arg, vboxDev);
         }