Changeset 6231 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Jan 3, 2008 3:28:30 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions: add R3 backdoor logging for Linux guests

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (2 diffs)

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

@@ -362 +362 @@
         int rc = 0;
 
-        switch (cmd) {
-        case IOCTL_VBOXGUEST_WAITEVENT:
-                rc = vboxadd_wait_event((void *) arg);
-                break;
-
-        case VBOXGUEST_IOCTL_WAITEVENT_INTERRUPT_ALL:
-                ++vboxDev->u32GuestInterruptions;
-                break;
-
-        case IOCTL_VBOXGUEST_VMMREQUEST: {
+        /* Deal with variable size ioctls first. */
+        if (VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_LOG(0)) == VBOXGUEST_IOCTL_NUMBER(cmd)) {
+                char *pszMessage = kmalloc(VBOXGUEST_IOCTL_SIZE(cmd), GFP_KERNEL);
+                if (NULL == pszMessage) {
+                        LogRelFunc(("VBOXGUEST_IOCTL_LOG: cannot allocate %d bytes of memory!\n",
+                                    VBOXGUEST_IOCTL_SIZE(cmd)));
+                        rc = -ENOMEM;
+                }
+                if (   (0 == rc)
+                    && copy_from_user(pszMessage, (void*)arg, VBOXGUEST_IOCTL_SIZE(cmd))) {
+                        LogRelFunc(("VBOXGUEST_IOCTL_LOG: copy_from_user failed!\n"));
+                        rc = -EFAULT;
+                }
+                if (0 == rc) {
+                    Log(("%.*s", VBOXGUEST_IOCTL_SIZE(cmd), pszMessage));
+                }
+                if (NULL != pszMessage) {
+                    kfree(pszMessage);
+                }
+                return rc;
+        }
+
+        if (   VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_VMMREQUEST(0))
+            == VBOXGUEST_IOCTL_NUMBER(cmd))  {
             VMMDevRequestHeader reqHeader;
             VMMDevRequestHeader *reqFull = NULL;
@@ -446 +460 @@
             }
             VbglGRFree(reqFull);
-            break;
-        }
+            return rc;
+        }
+
+        switch (cmd) {
+        case IOCTL_VBOXGUEST_WAITEVENT:
+                rc = vboxadd_wait_event((void *) arg);
+                break;
+
+        case VBOXGUEST_IOCTL_WAITEVENT_INTERRUPT_ALL:
+                ++vboxDev->u32GuestInterruptions;
+                break;
 
         case IOCTL_VBOXGUEST_HGCM_CALL: