Changeset 6422 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 21, 2008 6:11:53 PM (17 years ago)

Author:

vboxsync

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

27388

Message:

Outlined how to handle the requests on solaris.

File:

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

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

@@ -725 +725 @@
      * driver, i.e. the request is just a fixed size header containing the buffer pointer and size of the
      * real request (SUPREQHDR). Trying to save the extra ddi_copyin isn't worth the effort and inflexibility. */
+#if 0
+    /*
+     * Read and validate the request wrapper.
+     */
+    VBGLBIGREQ ReqWrap;
+    if (IOCPARM_LEN(Cmd) != sizeof(ReqWrap))
+    {
+        Log((DEVICE_NAME ": VBoxAddSolarisIOCtl: bad request %#x\n", Cmd));
+        return ENOTTY;
+    }
+
+    rc = ddi_copyin((void *)pArg, &ReqWrap, sizeof(ReqWrap), 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;
+    }
+
+    if (ReqWrap.u32Magic != VBGLBIGREQ_MAGIC)
+    {
+        Log((DEVICE_NAME ": VBoxAddSolarisIOCtl: bad magic %#x; pArg=%p Cmd=%d.\n", ReqWrap.u32Magic, pArg, Cmd));
+        return EINVAL;
+    }
+    if (RT_UNLIKELY(   ReqWrap.cbData == 0
+                    || ReqWrap.cbData > _1M*16))
+    {
+        Log((DEVICE_NAME ": VBoxAddSolarisIOCtl: bad size %#x; pArg=%p Cmd=%d.\n", ReqWrap.cbData, pArg, Cmd));
+        return EINVAL;
+    }
+
+#else
     uint32_t cbBuf = 0;
     int rc = 0;
@@ -842 +873 @@
         cbBuf += Hdr.cParms * sizeof(HGCMFunctionParameter);
     }
+#endif
 
     /*
      * Read the request.
      */
+#if 0
+    void *pvBuf = RTMemTmpAlloc(ReqWrap.cbData);
+#else
     void *pvBuf = RTMemTmpAlloc(cbBuf);
+#endif
     if (RT_UNLIKELY(!pvBuf))
     {
@@ -853 +889 @@
     }
 
+#if 0
+    rc = ddi_copyin((void *)pArg, (void *)(uintptr_t)ReqWrap.pvData, ReqWrap.cbData, Mode);
+#else
     rc = ddi_copyin((void *)pArg, pvBuf, cbBuf, Mode);
+#endif
     if (RT_UNLIKELY(rc))
     {
@@ -879 +919 @@
             cbDataReturned = cbBuf;
         }
+#if 0
+        rc = ddi_copyout(pvBuf, (void *)(uintptr_t)ReqWrap.pvData, cbDataReturned, Mode);
+#else
         rc = ddi_copyout(pvBuf, (void *)pArg, cbDataReturned, Mode);
+#endif
         if (RT_UNLIKELY(rc))
         {