Changeset 6301 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 9, 2008 4:41:26 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27166

Message:

Solaris guest additions: Got x11 vboxvideo working. Changed guest kernel driver ioctl, verified with previously working additions.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -730 +730 @@
 #endif
 
-    /** @todo I'll remove this size check after testing. */
     uint32_t cbBuf = 0;
+    int rc = 0;
+    int requestType = 0;
     if (    Cmd >= VBOXGUEST_IOCTL_VMMREQUEST(0)
         &&  Cmd <= VBOXGUEST_IOCTL_VMMREQUEST(0xfff))
     {
         cbBuf = sizeof(VMMDevRequestHeader);
+        requestType = 1;
         LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_VMMREQUEST"));
     }
@@ -789 +791 @@
         }
     }
-#if 0
-    /* cbBuf must actually get the size based on the VMM request type.
-     * Anyway, this obtaining cbBuf businesss will be removed eventually.
-     */
-    if (RT_UNLIKELY(cbBuf != IOCPARM_LEN(Cmd)))
+    if (RT_UNLIKELY(cbBuf > IOCPARM_LEN(Cmd)))
     {
         LogRel((DEVICE_NAME ":VBoxAddSolarisIOCtl: buffer size mismatch. size=%d expected=%d.\n", IOCPARM_LEN(Cmd), cbBuf));
         return EINVAL;
     }
-#endif
-
-    cbBuf = IOCPARM_LEN(Cmd);
+
+    /*
+     * Read the header.
+     */
+    if (requestType == 1)
+    {
+        VMMDevRequestHeader Hdr;
+        rc = ddi_copyin((void*)pArg, &Hdr, sizeof(Hdr), Mode);
+        if (RT_UNLIKELY(rc))
+        {
+            Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: ddi_copyin failed to read header pArg=%p Cmd=%d. rc=%d.\n", pArg, Cmd, rc));
+            return EINVAL;
+        }
+
+        cbBuf = Hdr.size;
+        if (RT_UNLIKELY(cbBuf < sizeof(Hdr)))
+        {
+            Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: Invalid request size (%d) in header.\n", cbBuf));
+            return EINVAL;
+        }
+    }
+    /** @todo handle HGCM calls. */
+
+    /*
+     * Read the request.
+     */
     void *pvBuf = RTMemTmpAlloc(cbBuf);
     if (RT_UNLIKELY(!pvBuf))
@@ -808 +829 @@
     }
 
-    int rc = ddi_copyin((void *)pArg, pvBuf, cbBuf, Mode);
+    rc = ddi_copyin((void *)pArg, pvBuf, cbBuf, Mode);
     if (RT_UNLIKELY(rc))
     {
@@ -822 +843 @@
     Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: pSession=%p pid=%d.\n", pSession, (int)RTProcSelf()));
 
+    /*
+     * Process the IOCtl.
+     */
     size_t cbDataReturned;
     rc = VBoxGuestCommonIOCtl(Cmd, &g_DevExt, pSession, pvBuf, cbBuf, &cbDataReturned);