Changeset 10377 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 8, 2008 4:26:13 PM (17 years ago)

Author:

vboxsync

Message:

Implemented the IDC methods. Moved the setting of the R0Process and Process SUPDRVSESSION members to SUPDrv.c, and made SUPDrv.c provide default initialization of the Uid and Gid members.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.c (modified) (17 diffs)
• SUPDrvIDC.h (modified) (1 diff)
• SUPDrvIOC.h (modified) (1 diff)
• SUPDrvInternal.h (modified) (4 diffs)
• SUPR0IdcClient.c (modified) (5 diffs)
• darwin/SUPDrv-darwin.cpp (modified) (2 diffs)
• freebsd/SUPDrv-freebsd.c (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (1 diff)
• linux/files_vboxdrv (modified) (1 diff)
• os2/SUPDrv-os2.cpp (modified) (1 diff)
• solaris/SUPDrv-solaris.c (modified) (3 diffs)
• win/SUPDrv-win.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -335 +335 @@
 
 
+#
+# SUPDrv.c needs the VBOX_SVN_REV.
+#
+SUPDrv.c_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
+
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -45 +45 @@
 #include <iprt/cpuset.h>
 #include <iprt/log.h>
+#include <iprt/uuid.h>
+#include <VBox/err.h>
 /* VBox/x86.h not compatible with the Linux kernel sources */
 #ifdef RT_OS_LINUX
@@ -106 +108 @@
     (   VALID_PTR(pSession) \
      && pSession->u32Cookie == BIRD_INV)
+
+/** @def VBOX_SVN_REV
+ * The makefile should define this if it can. */
+#ifndef VBOX_SVN_REV
+# define VBOX_SVN_REV 0
+#endif
 
 
@@ -240 +248 @@
 static int      supdrvIOCtl_LdrFree(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPLDRFREE pReq);
 static int      supdrvIOCtl_LdrGetSymbol(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPLDRGETSYMBOL pReq);
+static int      supdrvIDC_LdrGetSymbol(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPDRVIDCREQGETSYM pReq);
 static int      supdrvLdrSetR0EP(PSUPDRVDEVEXT pDevExt, void *pvVMMR0, void *pvVMMR0EntryInt, void *pvVMMR0EntryFast, void *pvVMMR0EntryEx);
 static void     supdrvLdrUnsetR0EP(PSUPDRVDEVEXT pDevExt);
-static void     supdrvLdrAddUsage(PSUPDRVSESSION pSession, PSUPDRVLDRIMAGE pImage);
+static int      supdrvLdrAddUsage(PSUPDRVSESSION pSession, PSUPDRVLDRIMAGE pImage);
 static void     supdrvLdrFree(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage);
 static SUPPAGINGMODE supdrvIOCtl_GetPagingMode(void);
@@ -276 +285 @@
         if (!rc)
         {
-            rc = RTSemFastMutexCreate(&pDevExt->mtxGip);
+            rc = RTSemFastMutexCreate(&pDevExt->mtxComponentFactory);
             if (!rc)
             {
-                rc = supdrvGipCreate(pDevExt);
-                if (RT_SUCCESS(rc))
+                rc = RTSemFastMutexCreate(&pDevExt->mtxGip);
+                if (!rc)
                 {
-                    pDevExt->u32Cookie = BIRD;  /** @todo make this random? */
-                    return VINF_SUCCESS;
+                    rc = supdrvGipCreate(pDevExt);
+                    if (RT_SUCCESS(rc))
+                    {
+                        pDevExt->u32Cookie = BIRD;  /** @todo make this random? */
+                        return VINF_SUCCESS;
+                    }
+
+                    RTSemFastMutexDestroy(pDevExt->mtxGip);
+                    pDevExt->mtxGip = NIL_RTSEMFASTMUTEX;
                 }
-
-                RTSemFastMutexDestroy(pDevExt->mtxGip);
-                pDevExt->mtxGip = NIL_RTSEMFASTMUTEX;
+                RTSemFastMutexDestroy(pDevExt->mtxComponentFactory);
+                pDevExt->mtxComponentFactory = NIL_RTSEMFASTMUTEX;
             }
             RTSemFastMutexDestroy(pDevExt->mtxLdr);
@@ -371 +386 @@
  * @returns IPRT status code.
  * @param   pDevExt     Device extension.
+ * @param   fUser       Flag indicating whether this is a user or kernel session.
  * @param   ppSession   Where to store the pointer to the session data.
  */
-int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION *ppSession)
+int VBOXCALL supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, PSUPDRVSESSION *ppSession)
 {
     /*
@@ -391 +407 @@
             /*pSession->pLdrUsage         = NULL;
             pSession->pPatchUsage       = NULL;
+            pSession->pVM               = NULL;
             pSession->pUsage            = NULL;
             pSession->pGip              = NULL;
             pSession->fGipReferenced    = false;
-            pSession->Bundle.cUsed      = 0 */
+            pSession->Bundle.cUsed      = 0; */
+            pSession->Uid               = NIL_RTUID;
+            pSession->Gid               = NIL_RTGID;
+            if (fUser)
+            {
+                pSession->Process       = RTProcSelf();
+                pSession->R0Process     = RTR0ProcHandleSelf();
+            }
+            else
+            {
+                pSession->Process       = NIL_RTPROCESS;
+                pSession->R0Process     = NIL_RTR0PROCESS;
+            }
 
             LogFlow(("Created session %p initial cookie=%#x\n", pSession, pSession->u32Cookie));
@@ -569 +598 @@
 
     /*
+     * Deregister component factories.
+     */
+    RTSemFastMutexRequest(pDevExt->mtxComponentFactory);
+    Log2(("deregistering component factories:\n"));
+    if (pDevExt->pComponentFactoryHead)
+    {
+        PSUPDRVFACTORYREG pPrev = NULL;
+        PSUPDRVFACTORYREG pCur = pDevExt->pComponentFactoryHead;
+        while (pCur)
+        {
+            if (pCur->pSession == pSession)
+            {
+                /* unlink it */
+                PSUPDRVFACTORYREG pNext = pCur->pNext;
+                if (pPrev)
+                    pPrev->pNext = pNext;
+                else
+                    pDevExt->pComponentFactoryHead = pNext;
+
+                /* free it */
+                pCur->pNext = NULL;
+                pCur->pSession = NULL;
+                pCur->pFactory = NULL;
+                RTMemFree(pCur);
+
+                /* next */
+                pCur = pNext;
+            }
+            else
+            {
+                /* next */
+                pPrev = pCur;
+                pCur = pCur->pNext;
+            }
+        }
+    }
+    RTSemFastMutexRelease(pDevExt->mtxComponentFactory);
+    Log2(("deregistering component factories - done\n"));
+
+    /*
      * Loaded images needs to be dereferenced and possibly freed up.
      */
@@ -1164 +1233 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_INVALID_PARAMETER if the request is invalid.
  * @retval  VERR_NOT_SUPPORTED if the request isn't supported.
- * @retval  VERR_NOT_IMPLEMENTED if during development.
- * @retval  VERR_INVALID_PARAMETER if the request is invalid.
  *
  * @param   uReq        The request (function) code.
@@ -1206 +1274 @@
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_CONNECT, sizeof(*pReq));
 
-            return VERR_NOT_IMPLEMENTED;
+            /*
+             * Validate the cookie and other input.
+             */
+            if (pReq->Hdr.pSession != NULL)
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: pSession=%p expected NULL!\n", pReq->Hdr.pSession));
+                return pReqHdr->rc = VERR_INVALID_PARAMETER;
+            }
+            if (pReq->u.In.u32MagicCookie != SUPDRVIDCREQ_CONNECT_MAGIC_COOKIE)
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: u32MagicCookie=%#x expected %#x!\n",
+                            pReq->u.In.u32MagicCookie, SUPDRVIDCREQ_CONNECT_MAGIC_COOKIE));
+                return pReqHdr->rc = VERR_INVALID_PARAMETER;
+            }
+            if (    pReq->u.In.uMinVersion > pReq->u.In.uReqVersion
+                ||  (pReq->u.In.uMinVersion & UINT32_C(0xffff0000)) != (pReq->u.In.uReqVersion & UINT32_C(0xffff0000)))
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: uMinVersion=%#x uMaxVersion=%#x doesn't match!\n",
+                            pReq->u.In.uMinVersion, pReq->u.In.uReqVersion));
+                return pReqHdr->rc = VERR_INVALID_PARAMETER;
+            }
+
+            /*
+             * Match the version.
+             * The current logic is very simple, match the major interface version.
+             */
+            if (    pReq->u.In.uMinVersion > SUPDRV_IDC_VERSION
+                ||  (pReq->u.In.uMinVersion & 0xffff0000) != (SUPDRV_IDC_VERSION & 0xffff0000))
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: Version mismatch. Requested: %#x  Min: %#x  Current: %#x\n",
+                            pReq->u.In.uReqVersion, pReq->u.In.uMinVersion, SUPDRV_IDC_VERSION));
+                pReq->u.Out.pSession        = NULL;
+                pReq->u.Out.uSessionVersion = 0xffffffff;
+                pReq->u.Out.uDriverVersion  = SUPDRVIOC_VERSION;
+                pReq->u.Out.uDriverRevision = VBOX_SVN_REV;
+                pReq->Hdr.rc = VERR_VERSION_MISMATCH;
+                return VINF_SUCCESS;
+            }
+
+            pReq->u.Out.pSession        = NULL;
+            pReq->u.Out.uSessionVersion = SUPDRVIOC_VERSION;
+            pReq->u.Out.uDriverVersion  = SUPDRVIOC_VERSION;
+            pReq->u.Out.uDriverRevision = VBOX_SVN_REV;
+
+            /*
+             * On NT we will already have a session associated with the
+             * client, just like with the SUP_IOCTL_COOKIE request, while
+             * the other doesn't.
+             */
+#ifdef RT_OS_WINDOWS
+            pReq->Hdr.rc = VINF_SUCCESS;
+#else
+            AssertReturn(!pSession, VERR_INTERNAL_ERROR);
+            pReq->Hdr.rc = supdrvCreateSession(pDevExt, false /* fUser */, &pSession);
+            if (RT_FAILURE(pReq->Hdr.rc))
+            {
+                OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: failed to create session, rc=%d\n", pReq->Hdr.rc));
+                return VINF_SUCCESS;
+            }
+#endif
+
+            pReq->u.Out.pSession = pSession;
+            pReq->Hdr.pSession = pSession;
+
+            return VINF_SUCCESS;
         }
 
@@ -1213 +1345 @@
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_DISCONNECT, sizeof(*pReqHdr));
 
-            return VERR_NOT_IMPLEMENTED;
+#ifdef RT_OS_WINDOWS
+            /* Windows will destroy the session when the file object is destroyed. */
+#else
+            supdrvCloseSession(pDevExt, pSession);
+#endif
+            return pReqHdr->rc = VINF_SUCCESS;
         }
 
         case SUPDRV_IDC_REQ_GET_SYMBOL:
         {
-            PSUPDRVIDCREQGETSYM pReq;
+            PSUPDRVIDCREQGETSYM pReq = (PSUPDRVIDCREQGETSYM)pReqHdr;
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_GET_SYMBOL, sizeof(*pReq));
 
-            return VERR_NOT_IMPLEMENTED;
+            pReq->Hdr.rc = supdrvIDC_LdrGetSymbol(pDevExt, pSession, pReq);
+            return VINF_SUCCESS;
         }
 
         case SUPDRV_IDC_REQ_COMPONENT_REGISTER_FACTORY:
         {
-            PSUPDRVIDCREQCOMPREGFACTORY pReq;
+            PSUPDRVIDCREQCOMPREGFACTORY pReq = (PSUPDRVIDCREQCOMPREGFACTORY)pReqHdr;
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_COMPONENT_REGISTER_FACTORY, sizeof(*pReq));
 
-            return VERR_NOT_IMPLEMENTED;
+            pReq->Hdr.rc = SUPR0ComponentRegisterFactory(pSession, pReq->u.In.pFactory);
+            return VINF_SUCCESS;
         }
 
         case SUPDRV_IDC_REQ_COMPONENT_DEREGISTER_FACTORY:
         {
-            PSUPDRVIDCREQCOMPDEREGFACTORY pReq;
+            PSUPDRVIDCREQCOMPDEREGFACTORY pReq = (PSUPDRVIDCREQCOMPDEREGFACTORY)pReqHdr;
             REQ_CHECK_IDC_SIZE(SUPDRV_IDC_REQ_COMPONENT_DEREGISTER_FACTORY, sizeof(*pReq));
 
-            return VERR_NOT_IMPLEMENTED;
+            pReq->Hdr.rc = SUPR0ComponentDeregisterFactory(pSession, pReq->u.In.pFactory);
+            return VINF_SUCCESS;
         }
 
@@ -2288 +2428 @@
     RTSemFastMutexRelease(pDevExt->mtxGip);
 
+    return rc;
+}
+
+
+/**
+ * Register a component factory with the support driver.
+ *
+ * This is currently restricted to kernel sessions only.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_NO_MEMORY if we're out of memory.
+ * @retval  VERR_ALREADY_EXISTS if the factory has already been registered.
+ * @retval  VERR_ACCESS_DENIED if it isn't a kernel session.
+ * @retval  VERR_INVALID_PARAMETER on invalid parameter.
+ * @retval  VERR_INVALID_POINTER on invalid pointer parameter.
+ *
+ * @param   pSession        The SUPDRV session (must be a ring-0 session).
+ * @param   pFactory        Pointer to the component factory registration structure.
+ *
+ * @remarks This interface is also available via SUPR0IdcComponentRegisterFactory.
+ */
+SUPR0DECL(int) SUPR0ComponentRegisterFactory(PSUPDRVSESSION pSession, PCSUPDRVFACTORY pFactory)
+{
+    PSUPDRVFACTORYREG pNewReg;
+    const char *psz;
+    int rc;
+
+    /*
+     * Validate parameters.
+     */
+    AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
+    AssertReturn(pSession->R0Process == NIL_RTR0PROCESS, VERR_ACCESS_DENIED);
+    AssertPtrReturn(pFactory, VERR_INVALID_POINTER);
+    AssertPtrReturn(pFactory->pfnQueryFactoryInterface, VERR_INVALID_POINTER);
+    psz = (const char *)memchr(pFactory->szName, '\0', sizeof(pFactory->szName));
+    AssertReturn(psz, VERR_INVALID_PARAMETER);
+
+    /*
+     * Allocate and initialize a new registration structure.
+     */
+    pNewReg = (PSUPDRVFACTORYREG)RTMemAlloc(sizeof(SUPDRVFACTORYREG));
+    if (pNewReg)
+    {
+        pNewReg->pNext = NULL;
+        pNewReg->pFactory = pFactory;
+        pNewReg->pSession = pSession;
+        pNewReg->cchName = psz - &pFactory->szName[0];
+
+        /*
+         * Add it to the tail of the list after checking for prior registration.
+         */
+        rc = RTSemFastMutexRequest(pSession->pDevExt->mtxComponentFactory);
+        if (RT_SUCCESS(rc))
+        {
+            PSUPDRVFACTORYREG pPrev = NULL;
+            PSUPDRVFACTORYREG pCur = pSession->pDevExt->pComponentFactoryHead;
+            while (pCur && pCur->pFactory != pFactory)
+            {
+                pPrev = pCur;
+                pCur = pCur->pNext;
+            }
+            if (!pCur)
+            {
+                if (pPrev)
+                    pPrev->pNext = pNewReg;
+                else
+                    pSession->pDevExt->pComponentFactoryHead = pNewReg;
+                rc = VINF_SUCCESS;
+            }
+            else
+                rc = VERR_ALREADY_EXISTS;
+
+            RTSemFastMutexRelease(pSession->pDevExt->mtxComponentFactory);
+        }
+
+        if (RT_FAILURE(rc))
+            RTMemFree(pNewReg);
+    }
+    else
+        rc = VERR_NO_MEMORY;
+    return rc;
+}
+
+
+/**
+ * Deregister a component factory.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_NOT_FOUND if the factory wasn't registered.
+ * @retval  VERR_ACCESS_DENIED if it isn't a kernel session.
+ * @retval  VERR_INVALID_PARAMETER on invalid parameter.
+ * @retval  VERR_INVALID_POINTER on invalid pointer parameter.
+ *
+ * @param   pSession        The SUPDRV session (must be a ring-0 session).
+ * @param   pFactory        Pointer to the component factory registration structure
+ *                          previously passed SUPR0ComponentRegisterFactory().
+ *
+ * @remarks This interface is also available via SUPR0IdcComponentDeregisterFactory.
+ */
+SUPR0DECL(int) SUPR0ComponentDeregisterFactory(PSUPDRVSESSION pSession, PCSUPDRVFACTORY pFactory)
+{
+    int rc;
+
+    /*
+     * Validate parameters.
+     */
+    AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
+    AssertReturn(pSession->R0Process == NIL_RTR0PROCESS, VERR_ACCESS_DENIED);
+    AssertPtrReturn(pFactory, VERR_INVALID_POINTER);
+
+    /*
+     * Take the lock and look for the registration record.
+     */
+    rc = RTSemFastMutexRequest(pSession->pDevExt->mtxComponentFactory);
+    if (RT_SUCCESS(rc))
+    {
+        PSUPDRVFACTORYREG pPrev = NULL;
+        PSUPDRVFACTORYREG pCur = pSession->pDevExt->pComponentFactoryHead;
+        while (pCur && pCur->pFactory != pFactory)
+        {
+            pPrev = pCur;
+            pCur = pCur->pNext;
+        }
+        if (pCur)
+        {
+            if (!pPrev)
+                pSession->pDevExt->pComponentFactoryHead = pCur->pNext;
+            else
+                pPrev->pNext = pCur->pNext;
+
+            pCur->pNext = NULL;
+            pCur->pFactory = NULL;
+            pCur->pSession = NULL;
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VERR_NOT_FOUND;
+
+        RTSemFastMutexRelease(pSession->pDevExt->mtxComponentFactory);
+
+        RTMemFree(pCur);
+    }
+    return rc;
+}
+
+
+/**
+ * Queries a component factory.
+ *
+ * @returns VBox status code.
+ * @retval  VERR_INVALID_PARAMETER on invalid parameter.
+ * @retval  VERR_INVALID_POINTER on invalid pointer parameter.
+ * @retval  VERR_SUPDRV_COMPONENT_NOT_FOUND if the component factory wasn't found.
+ * @retval  VERR_SUPDRV_INTERFACE_NOT_SUPPORTED if the interface wasn't supported.
+ *
+ * @param   pSession            The SUPDRV session.
+ * @param   pszName             The name of the component factory.
+ * @param   pszInterfaceUuid    The UUID of the factory interface (stringified).
+ * @param   ppvFactoryIf        Where to store the factory interface.
+ */
+SUPR0DECL(int) SUPR0ComponentQueryFactory(PSUPDRVSESSION pSession, const char *pszName, const char *pszInterfaceUuid, void **ppvFactoryIf)
+{
+    const char *pszEnd;
+    size_t cchName;
+    int rc;
+
+    /*
+     * Validate parameters.
+     */
+    AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
+
+    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    pszEnd = memchr(pszName, '\0', RT_SIZEOFMEMB(SUPDRVFACTORY, szName));
+    AssertReturn(pszEnd, VERR_INVALID_PARAMETER);
+    cchName = pszEnd - pszName;
+
+    AssertPtrReturn(pszInterfaceUuid, VERR_INVALID_POINTER);
+    pszEnd = memchr(pszInterfaceUuid, '\0', RTUUID_STR_LENGTH);
+    AssertReturn(pszEnd, VERR_INVALID_PARAMETER);
+
+    AssertPtrReturn(ppvFactoryIf, VERR_INVALID_POINTER);
+    *ppvFactoryIf = NULL;
+
+    /*
+     * Take the lock and try all factories by this name.
+     */
+    rc = RTSemFastMutexRequest(pSession->pDevExt->mtxComponentFactory);
+    if (RT_SUCCESS(rc))
+    {
+        PSUPDRVFACTORYREG pCur = pSession->pDevExt->pComponentFactoryHead;
+        rc = VERR_SUPDRV_COMPONENT_NOT_FOUND;
+        while (pCur)
+        {
+            if (    pCur->cchName == cchName
+                &&  !memcmp(pCur->pFactory->szName, pszName, cchName))
+            {
+                void *pvFactory = pCur->pFactory->pfnQueryFactoryInterface(pCur->pFactory, pSession, pszInterfaceUuid);
+                if (pvFactory)
+                {
+                    *ppvFactoryIf = pvFactory;
+                    rc = VINF_SUCCESS;
+                    break;
+                }
+                rc = VERR_SUPDRV_INTERFACE_NOT_SUPPORTED;
+            }
+
+            /* next */
+            pCur = pCur->pNext;
+        }
+
+        RTSemFastMutexRelease(pSession->pDevExt->mtxComponentFactory);
+    }
     return rc;
 }
@@ -3446 +3800 @@
 
     /*
-     * Search the symbol string.
+     * Search the symbol strings.
      */
     pchStrings = (const char *)((uint8_t *)pImage->pvImage + pImage->offStrTab);
@@ -3463 +3817 @@
     RTSemFastMutexRelease(pDevExt->mtxLdr);
     pReq->u.Out.pvSymbol = pvSymbol;
+    return rc;
+}
+
+
+/**
+ * Gets the address of a symbol in an open image or the support driver.
+ *
+ * @returns VINF_SUCCESS on success.
+ * @returns
+ * @param   pDevExt     Device globals.
+ * @param   pSession    Session data.
+ * @param   pReq        The request buffer.
+ */
+static int supdrvIDC_LdrGetSymbol(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPDRVIDCREQGETSYM pReq)
+{
+    int             rc = VINF_SUCCESS;
+    const char     *pszSymbol = pReq->u.In.pszSymbol;
+    const char     *pszModule = pReq->u.In.pszModule;
+    size_t          cbSymbol;
+    char const     *pszEnd;
+    uint32_t        i;
+
+    /*
+     * Input validation.
+     */
+    AssertPtrReturn(pszSymbol, VERR_INVALID_POINTER);
+    pszEnd = (char *)memchr(pszSymbol, '\0', 512);
+    AssertReturn(pszEnd, VERR_INVALID_PARAMETER);
+    cbSymbol = pszEnd - pszSymbol + 1;
+
+    if (pszModule)
+    {
+        AssertPtrReturn(pszModule, VERR_INVALID_POINTER);
+        pszEnd = (char *)memchr(pszModule, '\0', 64);
+        AssertReturn(pszEnd, VERR_INVALID_PARAMETER);
+    }
+    Log3(("supdrvIDC_LdrGetSymbol: pszModule=%p:{%s} pszSymbol=%p:{%s}\n", pszModule, pszModule, pszSymbol, pszSymbol));
+
+
+    if (    !pszModule
+        ||  !strcmp(pszModule, "SupDrv"))
+    {
+        /*
+         * Search the support driver export table.
+         */
+        for (i = 0; i < RT_ELEMENTS(g_aFunctions); i++)
+            if (!strcmp(g_aFunctions[i].szName, pszSymbol))
+            {
+                pReq->u.Out.pfnSymbol = g_aFunctions[i].pfn;
+                break;
+            }
+    }
+    else
+    {
+        /*
+         * Find the loader image.
+         */
+        PSUPDRVLDRIMAGE pImage;
+
+        RTSemFastMutexRequest(pDevExt->mtxLdr);
+
+        for (pImage = pDevExt->pLdrImages; pImage; pImage = pImage->pNext)
+            if (!strcmp(pImage->szName, pszModule))
+                break;
+        if (pImage && pImage->uState == SUP_IOCTL_LDR_LOAD)
+        {
+            /*
+             * Search the symbol strings.
+             */
+            const char *pchStrings = (const char *)((uint8_t *)pImage->pvImage + pImage->offStrTab);
+            PCSUPLDRSYM paSyms     =  (PCSUPLDRSYM)((uint8_t *)pImage->pvImage + pImage->offSymbols);
+            for (i = 0; i < pImage->cSymbols; i++)
+            {
+                if (    paSyms[i].offSymbol < pImage->cbImage /* paranoia */
+                    &&  paSyms[i].offName + cbSymbol <= pImage->cbStrTab
+                    &&  !memcmp(pchStrings + paSyms[i].offName, pszSymbol, cbSymbol))
+                {
+                    /*
+                     * Found it! Calc the symbol address and add a reference to the module.
+                     */
+                    pReq->u.Out.pfnSymbol = (PFNRT)((uint8_t *)pImage->pvImage + paSyms[i].offSymbol);
+                    rc = supdrvLdrAddUsage(pSession, pImage);
+                    break;
+                }
+            }
+        }
+        else
+            rc = pImage ? VERR_WRONG_ORDER : VERR_MODULE_NOT_FOUND;
+
+        RTSemFastMutexRelease(pDevExt->mtxLdr);
+    }
     return rc;
 }
@@ -3566 +4011 @@
  * Adds a usage reference in the specified session of an image.
  *
+ * Called while owning the loader semaphore.
+ *
+ * @returns VINF_SUCCESS on success and VERR_NO_MEMORY on failure.
  * @param   pSession    Session in question.
  * @param   pImage      Image which the session is using.
  */
-static void supdrvLdrAddUsage(PSUPDRVSESSION pSession, PSUPDRVLDRIMAGE pImage)
+static int supdrvLdrAddUsage(PSUPDRVSESSION pSession, PSUPDRVLDRIMAGE pImage)
 {
     PSUPDRVLDRUSAGE pUsage;
@@ -3583 +4031 @@
         {
             pUsage->cUsage++;
-            return;
+            return VINF_SUCCESS;
         }
         pUsage = pUsage->pNext;
@@ -3592 +4040 @@
      */
     pUsage = (PSUPDRVLDRUSAGE)RTMemAlloc(sizeof(*pUsage));
-    Assert(pUsage);
-    if (pUsage)
-    {
-        pUsage->cUsage = 1;
-        pUsage->pImage = pImage;
-        pUsage->pNext  = pSession->pLdrUsage;
-        pSession->pLdrUsage = pUsage;
-    }
-    /* ignore errors... */
+    AssertReturn(pUsage, VERR_NO_MEMORY);
+    pUsage->cUsage = 1;
+    pUsage->pImage = pImage;
+    pUsage->pNext  = pSession->pLdrUsage;
+    pSession->pLdrUsage = pUsage;
+    return VINF_SUCCESS;
 }
 
@@ -4089 +4534 @@
     int         cLoops = 8;
     bool        fAsync = false;
-    int         rc;
+    int         rc = VINF_SUCCESS;
     uint64_t    offMax = 0;
     uint64_t    offMin = ~(uint64_t)0;

trunk/src/VBox/HostDrivers/Support/SUPDrvIDC.h

@@ -112 +112 @@
         struct SUPDRVIDCREQCONNECTOUT
         {
-            /** The version of the IDC interface for this session. */
-            uint32_t        uVersion;
             /** The support driver session. (An opaque.) */
             PSUPDRVSESSION  pSession;
+            /** The version of the IDC interface for this session. */
+            uint32_t        uSessionVersion;
+            /** The version of the IDC interface . */
+            uint32_t        uDriverVersion;
+            /** The SVN revision of the driver.
+             * This will be set to 0 if not compiled into the driver. */
+            uint32_t        uDriverRevision;
         } Out;
     } u;

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -370 +370 @@
     /** Offset of the symbol relative to the image load address. */
     uint32_t        offSymbol;
-} SUPLDRSYM, *PSUPLDRSYM;
+} SUPLDRSYM;
+/** Pointer to a symbol table entry. */
+typedef SUPLDRSYM *PSUPLDRSYM;
+/** Pointer to a const symbol table entry. */
+typedef SUPLDRSYM const *PCSUPLDRSYM;
 
 /**

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -459 +459 @@
 
 /**
+ * Component factory registration record.
+ */
+typedef struct SUPDRVFACTORYREG
+{
+    /** Pointer to the next registration. */
+    struct SUPDRVFACTORYREG    *pNext;
+    /** Pointer to the registered factory. */
+    PCSUPDRVFACTORY             pFactory;
+    /** The session owning the factory.
+     * Used for deregistration and session cleanup. */
+    PSUPDRVSESSION              pSession;
+    /** Length of the name. */
+    size_t                      cchName;
+} SUPDRVFACTORYREG;
+/** Pointer to a component factory registration record. */
+typedef SUPDRVFACTORYREG *PSUPDRVFACTORYREG;
+/** Pointer to a const component factory registration record. */
+typedef SUPDRVFACTORYREG const *PCSUPDRVFACTORYREG;
+
+
+/**
  * Registered object.
  * This takes care of reference counting and tracking data for access checks.
@@ -539 +560 @@
     /** The group id of the session. (Set by the OS part.) */
     RTGID                       Gid;
-    /** The process (id) of the session. (Set by the OS part.) */
+    /** The process (id) of the session. */
     RTPROCESS                   Process;
     /** Which process this session is associated with.
@@ -621 +642 @@
      * This CPU is responsible for the updating the common GIP data. */
     RTCPUID volatile        idGipMaster;
+
+    /** Component factory mutex.
+     * This protects pComponentFactoryHead and component factory querying. */
+    RTSEMFASTMUTEX          mtxComponentFactory;
+    /** The head of the list of registered component factories. */
+    PSUPDRVFACTORYREG       pComponentFactoryHead;
 } SUPDRVDEVEXT;
 
@@ -642 +669 @@
 int  VBOXCALL   supdrvInitDevExt(PSUPDRVDEVEXT pDevExt);
 void VBOXCALL   supdrvDeleteDevExt(PSUPDRVDEVEXT pDevExt);
-int  VBOXCALL   supdrvCreateSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION *ppSession);
+int  VBOXCALL   supdrvCreateSession(PSUPDRVDEVEXT pDevExt, bool fUser, PSUPDRVSESSION *ppSession);
 void VBOXCALL   supdrvCloseSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession);
 void VBOXCALL   supdrvCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession);

trunk/src/VBox/HostDrivers/Support/SUPR0IdcClient.c

@@ -49 +49 @@
  *
  * @returns VBox status code.
- * @param   pHandle         The handle structure (output).
- * @param   uReqVersion     The requested version. Pass 0 for default.
- * @param   uMinVersion     The minimum required version. Pass 0 for default.
- * @param   puVersion       Where to store the version of the IDC interface. Optional.
- */
-SUPR0DECL(int) SUPR0IdcOpen(PSUPDRVIDCHANDLE pHandle, uint32_t uReqVersion, uint32_t uMinVersion, uint32_t *puVersion)
+ * @param   pHandle             The handle structure (output).
+ * @param   uReqVersion         The requested version. Pass 0 for default.
+ * @param   uMinVersion         The minimum required version. Pass 0 for default.
+ * @param   puSessionVersion    Where to store the session version. Optional.
+ * @param   puDriverVersion     Where to store the session version. Optional.
+ * @param   puDriverRevision    Where to store the SVN revision of the driver. Optional.
+ */
+SUPR0DECL(int) SUPR0IdcOpen(PSUPDRVIDCHANDLE pHandle, uint32_t uReqVersion, uint32_t uMinVersion,
+                            uint32_t *puSessionVersion, uint32_t *puDriverVersion, uint32_t *puDriverRevision)
 {
     unsigned uDefaultMinVersion;
@@ -65 +68 @@
     AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
     pHandle->s.pSession = NULL;
-    AssertPtrNullReturn(puVersion, VERR_INVALID_POINTER);
-    if (puVersion)
-        *puVersion = 0;
+
+    AssertPtrNullReturn(puSessionVersion, VERR_INVALID_POINTER);
+    if (puSessionVersion)
+        *puSessionVersion = 0;
+
+    AssertPtrNullReturn(puDriverVersion, VERR_INVALID_POINTER);
+    if (puDriverVersion)
+        *puDriverVersion = 0;
+
+    AssertPtrNullReturn(puDriverRevision, VERR_INVALID_POINTER);
+    if (puDriverRevision)
+        *puDriverRevision = 0;
+
     AssertReturn(!uMinVersion || (uMinVersion & UINT32_C(0xffff0000)) == (SUPDRV_IDC_VERSION & UINT32_C(0xffff0000)), VERR_INVALID_PARAMETER);
     AssertReturn(!uReqVersion || (uReqVersion & UINT32_C(0xffff0000)) == (SUPDRV_IDC_VERSION & UINT32_C(0xffff0000)), VERR_INVALID_PARAMETER);
@@ -100 +113 @@
     {
         pHandle->s.pSession = Req.u.Out.pSession;
-        if (puVersion)
-            *puVersion = Req.u.Out.uVersion;
+        if (puSessionVersion)
+            *puSessionVersion = Req.u.Out.uSessionVersion;
+        if (puDriverVersion)
+            *puDriverVersion = Req.u.Out.uDriverVersion;
+        if (puDriverRevision)
+            *puDriverRevision = Req.u.Out.uDriverRevision;
 
         /*
@@ -108 +125 @@
          */
         if (    VALID_PTR(Req.u.Out.pSession)
-            &&  Req.u.Out.uVersion >= uMinVersion
-            &&  (Req.u.Out.uVersion & UINT32_C(0xffff0000)) == (SUPDRV_IDC_VERSION & UINT32_C(0xffff0000)))
+            &&  Req.u.Out.uSessionVersion >= uMinVersion
+            &&  (Req.u.Out.uSessionVersion & UINT32_C(0xffff0000)) == (SUPDRV_IDC_VERSION & UINT32_C(0xffff0000)))
         {
             ASMAtomicCmpXchgPtr((void * volatile *)&g_pMainHandle, pHandle, NULL);
@@ -115 +132 @@
         }
 
-        AssertMsgFailed(("pSession=%p uVersion=0x%x\n", Req.u.Out.pSession, Req.u.Out.uVersion));
+        AssertMsgFailed(("pSession=%p uSessionVersion=0x%x (r%u)\n", Req.u.Out.pSession, Req.u.Out.uSessionVersion, Req.u.Out.uDriverRevision));
         rc = VERR_VERSION_MISMATCH;
         SUPR0IdcClose(pHandle);

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -322 +322 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_DevExt, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);
     if (RT_SUCCESS(rc))
     {
@@ -333 +333 @@
             pSession->Gid = pCred->cr_gid;
         }
-        pSession->Process = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
 
         /*

trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c

@@ -301 +301 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, &pSession);
+    rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, true /* fUser */, &pSession);
     if (RT_SUCCESS(rc))
     {
-        pSession->Uid = 0;
-        pSession->Gid = 0;
-        pSession->Process = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
+        /** @todo get (e)uid and (e)gid.
+        pSession->Uid = stuff;
+        pSession->Gid = stuff; */
         if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))
             return 0;

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -679 +679 @@
      * Call common code for the rest.
      */
-    rc = supdrvCreateSession(&g_DevExt, (PSUPDRVSESSION *)&pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, (PSUPDRVSESSION *)&pSession);
     if (!rc)
     {
-        pSession->Uid       = current->euid;
-        pSession->Gid       = current->egid;
-        pSession->Process   = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
+        pSession->Uid = current->euid;
+        pSession->Gid = current->egid;
     }
 

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -53 +53 @@
     ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
     ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
+    ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
     ${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
     ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
+    ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
     ${PATH_ROOT}/include/VBox/log.h=>include/VBox/log.h \
     ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \

trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp

@@ -151 +151 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_DevExt, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);
     if (RT_SUCCESS(rc))
     {
-        pSession->Process = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
         pSession->sfn = sfn;
 

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -420 +420 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_DevExt, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);
     if (RT_SUCCESS(rc))
     {
+        pSession->Uid = crgetuid(pCred);
+        pSession->Gid = crgetgid(pCred);
+
         pState->pSession = pSession;
         *pDev = makedevice(getmajor(*pDev), iOpenInstance);
@@ -440 +443 @@
      * in VBoxDrvSolarisIOCtlSlow() while calling supdrvIOCtl()
      */
-    rc = supdrvCreateSession(&g_DevExt, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, &pSession);
     if (RT_SUCCESS(rc))
     {
@@ -446 +449 @@
         unsigned        iHash;
 
-        pSession->Uid       = crgetuid(pCred);
-        pSession->Gid       = crgetgid(pCred);
-        pSession->Process   = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
+        pSession->Uid = crgetuid(pCred);
+        pSession->Gid = crgetgid(pCred);
 
         /*

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -232 +232 @@
     pFileObj->FsContext = NULL;
     PSUPDRVSESSION pSession;
-    int rc = supdrvCreateSession(pDevExt, &pSession);
+#if 0 /** @todo check if this works, consider OBJ_KERNEL_HANDLE too. */
+    bool fUser = pIrp->RequestorMode != KernelMode;
+#else
+    bool fUser = true;
+#endif
+    int rc = supdrvCreateSession(pDevExt, fUser, &pSession);
     if (!rc)
-    {
-        pSession->Uid       = NIL_RTUID;
-        pSession->Gid       = NIL_RTGID;
-        pSession->Process   = RTProcSelf();
-        pSession->R0Process = RTR0ProcHandleSelf();
         pFileObj->FsContext = pSession;
-    }
 
     NTSTATUS    rcNt = pIrp->IoStatus.Status = VBoxDrvNtErr2NtStatus(rc);