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

Timestamp:

Aug 31, 2017 12:10:25 PM (8 years ago)

Author:

vboxsync

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

117782

Message:

merging vbglioc r117730: solaris adjustments.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-linux.c (modified) (5 diffs)
• VBoxGuest-solaris.c (modified) (5 diffs)
• VBoxGuest.cpp (modified) (1 diff)

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

@@ -49 +49 @@
 #include <iprt/spinlock.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #include <VBox/log.h>
 
@@ -892 +893 @@
  *       keep them all up to date when making changes!
  */
-int VBOXCALL VBoxGuestIDC(void *pvSession, uint32_t uReq, PVBGLREQHDR pReq, size_t cbReq)
+int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t uReq, PVBGLREQHDR pReqHdr, size_t cbReq)
 {
     /*
@@ -898 +899 @@
      */
     int rc;
-    if (   RT_VALID_PTR(pReq)
-        && cbReq >= sizeof(*pReq))
+    if (   RT_VALID_PTR(pReqHdr)
+        && cbReq >= sizeof(*pReqHdr))
     {
         /*
@@ -909 +910 @@
             if (   RT_VALID_PTR(pSession)
                 && pSession->pDevExt == &g_DevExt)
-                rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReq, cbReq);
+                rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReqHdr, cbReq);
             else
                 rc = VERR_INVALID_HANDLE;
@@ -918 +919 @@
             if (RT_SUCCESS(rc))
             {
-                rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReq, cbReq);
+                rc = VGDrvCommonIoCtl(uReq, &g_DevExt, pSession, pReqHdr, cbReq);
                 if (RT_FAILURE(rc))
                     VGDrvCommonCloseSession(&g_DevExt, pSession);

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

@@ -69 +69 @@
 static int vgdrvSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred);
 static int vgdrvSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred);
-static int vgdrvSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal);
+static int vgdrvSolarisIOCtl(dev_t Dev, int iCmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal);
+static int vgdrvSolarisIOCtlSlow(PVBOXGUESTSESSION pSession, int iCmd, int Mode, intptr_t pArgs);
 static int vgdrvSolarisPoll(dev_t Dev, short fEvents, int fAnyYet, short *pReqEvents, struct pollhead **ppPollHead);
 
@@ -596 +597 @@
 
 
-/** @def IOCPARM_LEN
- * Gets the length from the ioctl number.
- * This is normally defined by sys/ioccom.h on BSD systems...
- */
-#ifndef IOCPARM_LEN
-# define IOCPARM_LEN(Code)                      (((Code) >> 16) & IOCPARM_MASK)
-#endif
-
-
-/**
- * Converts a VBox status code to a Solaris error code.
- *
- * @returns corresponding Solaris errno.
- * @param   rcVBox        VirtualBox error code to convert.
- */
-static int vgdrvSolarisConvertToErrno(int rcVBox)
-{
-    /* RTErrConvertToErrno() below will ring-0 debug assert if we don't do such stuff. */
-    if (rcVBox == VERR_PERMISSION_DENIED)
-        rcVBox = VERR_ACCESS_DENIED;
-
-    if (   rcVBox > -1000
-        && rcVBox < 1000)
-        return RTErrConvertToErrno(rcVBox);
-
-    switch (rcVBox)
-    {
-        case VERR_HGCM_SERVICE_NOT_FOUND:      return ESRCH;
-        case VINF_HGCM_CLIENT_REJECTED:        return 0;
-        case VERR_HGCM_INVALID_CMD_ADDRESS:    return EFAULT;
-        case VINF_HGCM_ASYNC_EXECUTE:          return 0;
-        case VERR_HGCM_INTERNAL:               return EPROTO;
-        case VERR_HGCM_INVALID_CLIENT_ID:      return EINVAL;
-        case VINF_HGCM_SAVE_STATE:             return 0;
-        /* No reason to return this to a guest. */
-        /* case VERR_HGCM_SERVICE_EXISTS:      return EEXIST; */
-
-        default:
-        {
-            AssertMsgFailed(("Unhandled error code %Rrc\n", rcVBox));
-            return EINVAL;
-        }
-    }
-}
-
-
 /**
  * Driver ioctl, an alternate entry point for this character driver.
  *
  * @param   Dev             Device number
- * @param   Cmd             Operation identifier
+ * @param   iCmd            Operation identifier
  * @param   pArg            Arguments from user to driver
  * @param   Mode            Information bitfield (read/write, address space etc.)
@@ -654 +609 @@
  * @return  corresponding solaris error code.
  */
-static int vgdrvSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal)
-{
-    LogFlow(("vgdrvSolarisIOCtl: iCmd=%#x\n", Cmd));
-
+static int vgdrvSolarisIOCtl(dev_t Dev, int iCmd, intptr_t pArgs, int Mode, cred_t *pCred, int *pVal)
+{
     /*
      * Get the session from the soft state item.
@@ -664 +617 @@
     if (!pState)
     {
-        LogRel((DEVICE_NAME "::IOCtl: no state data for %d\n", getminor(Dev)));
+        LogRel(("vgdrvSolarisIOCtl: no state data for %#x (%d)\n", Dev, getminor(Dev)));
         return EINVAL;
     }
@@ -671 +624 @@
     if (!pSession)
     {
-        LogRel((DEVICE_NAME "::IOCtl: no session data for %d\n", getminor(Dev)));
+        LogRel(("vgdrvSolarisIOCtl: no session in state data for %#x (%d)\n", Dev, getminor(Dev)));
+        return DDI_SUCCESS;
+    }
+
+    /*
+     * Deal with fast requests.
+     */
+    if (VBGL_IOCTL_IS_FAST(iCmd))
+    {
+        *pVal = VGDrvCommonIoCtlFast(iCmd, &g_DevExt, pSession);
+        return 0;
+    }
+
+    return vgdrvSolarisIOCtlSlow(pSession, iCmd, Mode, pArgs);
+}
+
+
+/** @def IOCPARM_LEN
+ * Gets the length from the ioctl number.
+ * This is normally defined by sys/ioccom.h on BSD systems...
+ */
+#ifndef IOCPARM_LEN
+# define IOCPARM_LEN(x)     ( ((x) >> 16) & IOCPARM_MASK )
+#endif
+
+
+/**
+ * Worker for VBoxSupDrvIOCtl that takes the slow IOCtl functions.
+ *
+ * @returns Solaris errno.
+ *
+ * @param   pSession    The session.
+ * @param   iCmd        The IOCtl command.
+ * @param   Mode        Information bitfield (for specifying ownership of data)
+ * @param   iArg        User space address of the request buffer.
+ */
+static int vgdrvSolarisIOCtlSlow(PVBOXGUESTSESSION pSession, int iCmd, int Mode, intptr_t iArg)
+{
+    int         rc;
+    uint32_t    cbBuf = 0;
+    union
+    {
+        VBGLREQHDR  Hdr;
+        uint8_t     abBuf[64];
+    }           StackBuf;
+    PVBGLREQHDR  pHdr;
+
+
+    /*
+     * Read the header.
+     */
+    if (RT_UNLIKELY(IOCPARM_LEN(iCmd) != sizeof(StackBuf.Hdr)))
+    {
+        LogRel(("vgdrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(StackBuf.Hdr)));
         return EINVAL;
     }
+    rc = ddi_copyin((void *)iArg, &StackBuf.Hdr, sizeof(StackBuf.Hdr), Mode);
+    if (RT_UNLIKELY(rc))
+    {
+        LogRel(("vgdrvSolarisIOCtlSlow: ddi_copyin(,%#lx,) failed; iCmd=%#x. rc=%d\n", iArg, iCmd, rc));
+        return EFAULT;
+    }
+    if (RT_UNLIKELY(StackBuf.Hdr.uVersion != VBGLREQHDR_VERSION))
+    {
+        LogRel(("vgdrvSolarisIOCtlSlow: bad header version %#x; iCmd=%#x\n", StackBuf.Hdr.uVersion, iCmd));
+        return EINVAL;
+    }
+    cbBuf = RT_MAX(StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut);
+    if (RT_UNLIKELY(   StackBuf.Hdr.cbIn < sizeof(StackBuf.Hdr)
+                    || StackBuf.Hdr.cbOut < sizeof(StackBuf.Hdr)
+                    || cbBuf > _1M*16))
+    {
+        LogRel(("vgdrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut, iCmd));
+        return EINVAL;
+    }
 
     /*
-     * Read and validate the request wrapper.
+     * Buffer the request.
+     *
+     * Note! Common code revalidates the header sizes and version. So it's
+     *       fine to read it once more.
      */
-    VBGLBIGREQ ReqWrap;
-    if (IOCPARM_LEN(Cmd) != sizeof(ReqWrap))
-    {
-        LogRel((DEVICE_NAME "::IOCtl: bad request %#x size=%d expected=%d\n", Cmd, IOCPARM_LEN(Cmd), sizeof(ReqWrap)));
-        return ENOTTY;
-    }
-
-    int rc = ddi_copyin((void *)pArg, &ReqWrap, sizeof(ReqWrap), Mode);
+    if (cbBuf <= sizeof(StackBuf))
+        pHdr = &StackBuf.Hdr;
+    else
+    {
+        pHdr = RTMemTmpAlloc(cbBuf);
+        if (RT_UNLIKELY(!pHdr))
+        {
+            LogRel(("vgdrvSolarisIOCtlSlow: failed to allocate buffer of %d bytes for iCmd=%#x.\n", cbBuf, iCmd));
+            return ENOMEM;
+        }
+    }
+    rc = ddi_copyin((void *)iArg, pHdr, cbBuf, Mode);
     if (RT_UNLIKELY(rc))
     {
-        LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed to read header pArg=%p Cmd=%d. rc=%#x.\n", pArg, Cmd, rc));
-        return EINVAL;
-    }
-
-    if (ReqWrap.u32Magic != VBGLBIGREQ_MAGIC)
-    {
-        LogRel((DEVICE_NAME "::IOCtl: bad magic %#x; pArg=%p Cmd=%#x.\n", ReqWrap.u32Magic, pArg, Cmd));
-        return EINVAL;
-    }
-    if (RT_UNLIKELY(ReqWrap.cbData > _1M*16))
-    {
-        LogRel((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%#x.\n", ReqWrap.cbData, pArg, Cmd));
-        return EINVAL;
-    }
-
-    /*
-     * Read the request payload if any; requests like VBOXGUEST_IOCTL_CANCEL_ALL_WAITEVENTS have no data payload.
-     */
-    void *pvBuf = NULL;
-    if (RT_LIKELY(ReqWrap.cbData > 0))
-    {
-        pvBuf = RTMemTmpAlloc(ReqWrap.cbData);
-        if (RT_UNLIKELY(!pvBuf))
-        {
-            LogRel((DEVICE_NAME "::IOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", ReqWrap.cbData));
-            return ENOMEM;
-        }
-
-        rc = ddi_copyin((void *)(uintptr_t)ReqWrap.pvDataR3, pvBuf, ReqWrap.cbData, Mode);
-        if (RT_UNLIKELY(rc))
-        {
-            RTMemTmpFree(pvBuf);
-            LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
-            return EFAULT;
-        }
-        if (RT_UNLIKELY(!VALID_PTR(pvBuf)))
-        {
-            RTMemTmpFree(pvBuf);
-            LogRel((DEVICE_NAME "::IOCtl: pvBuf invalid pointer %p\n", pvBuf));
-            return EINVAL;
-        }
-    }
-    Log(("vgdrvSolarisIOCtl: pSession=%p pid=%d.\n", pSession, (int)RTProcSelf()));
+        LogRel(("vgdrvSolarisIOCtlSlow: copy_from_user(,%#lx, %#x) failed; iCmd=%#x. rc=%d\n", iArg, cbBuf, iCmd, rc));
+        if (pHdr != &StackBuf.Hdr)
+            RTMemFree(pHdr);
+        return EFAULT;
+    }
 
     /*
      * Process the IOCtl.
      */
-    size_t cbDataReturned = 0;
-    rc = VGDrvCommonIoCtl(Cmd, &g_DevExt, pSession, pvBuf, ReqWrap.cbData, &cbDataReturned);
+    rc = VGDrvCommonIoCtl(iCmd, &g_DevExt, pSession, pHdr, cbBuf);
+
+    /*
+     * Copy ioctl data and output buffer back to user space.
+     */
     if (RT_SUCCESS(rc))
     {
-        rc = 0;
-        if (RT_UNLIKELY(cbDataReturned > ReqWrap.cbData))
-        {
-            LogRel((DEVICE_NAME "::IOCtl: too much output data %d expected %d\n", cbDataReturned, ReqWrap.cbData));
-            cbDataReturned = ReqWrap.cbData;
-        }
-        if (cbDataReturned > 0)
-        {
-            rc = ddi_copyout(pvBuf, (void *)(uintptr_t)ReqWrap.pvDataR3, cbDataReturned, Mode);
-            if (RT_UNLIKELY(rc))
-            {
-                LogRel((DEVICE_NAME "::IOCtl: ddi_copyout failed; pvBuf=%p pArg=%p cbDataReturned=%u Cmd=%d. rc=%d\n",
-                        pvBuf, pArg, cbDataReturned, Cmd, rc));
-                rc = EFAULT;
-            }
+        uint32_t cbOut = pHdr->cbOut;
+        if (RT_UNLIKELY(cbOut > cbBuf))
+        {
+            LogRel(("vgdrvSolarisIOCtlSlow: too much output! %#x > %#x; iCmd=%#x!\n", cbOut, cbBuf, iCmd));
+            cbOut = cbBuf;
+        }
+        rc = ddi_copyout(pHdr, (void *)iArg, cbOut, Mode);
+        if (RT_UNLIKELY(rc != 0))
+        {
+            /* this is really bad */
+            LogRel(("vgdrvSolarisIOCtlSlow: ddi_copyout(,%p,%d) failed. rc=%d\n", (void *)iArg, cbBuf, rc));
+            rc = EFAULT;
         }
     }
     else
-    {
-        /*
-         * We Log() instead of LogRel() here because VBOXGUEST_IOCTL_WAITEVENT can return VERR_TIMEOUT,
-         * VBOXGUEST_IOCTL_CANCEL_ALL_EVENTS can return VERR_INTERRUPTED and possibly more in the future;
-         * which are not really failures that require logging.
-         */
-        Log(("vgdrvSolarisIOCtl: VGDrvCommonIoCtl failed. Cmd=%#x rc=%d\n", Cmd, rc));
-        rc = vgdrvSolarisConvertToErrno(rc);
-    }
-    *pVal = rc;
-    if (pvBuf)
-        RTMemTmpFree(pvBuf);
+        rc = EINVAL;
+
+    if (pHdr != &StackBuf.Hdr)
+        RTMemTmpFree(pHdr);
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -3978 +3978 @@
 #if defined(VBOXGUEST_MOUSE_NOTIFY_CAN_PREEMPT) && !defined(RT_OS_WINDOWS) /* (Windows does this in the Dpc callback) */
     if (   fMousePositionChanged
-        && pDevExt->MouseNotifyCallback.pfnNotify)
-        pDevExt->MouseNotifyCallback.pfnNotify(pDevExt->MouseNotifyCallback.pvUser);
+        && pDevExt->pfnMouseNotifyCallback)
+        pDevExt->pfnMouseNotifyCallback(pDevExt->pvMouseNotifyCallbackArg);
 #endif