Changeset 44181 in vbox for trunk/src/VBox

Timestamp:

Dec 19, 2012 7:10:10 PM (12 years ago)

Author:

vboxsync

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

82891

Message:

SUPDrv-solaris.c: /dev/vboxdrvu (untested).

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (9 diffs)

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

@@ -72 +72 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** The module name. */
-#define DEVICE_NAME              "vboxdrv"
+/** The system device name. */
+#define DEVICE_NAME_SYS          "vboxdrv"
+/** The user device name. */
+#define DEVICE_NAME_USR          "vboxdrvu"
 /** The module description as seen in 'modinfo'. */
 #define DEVICE_DESC              "VirtualBox HostDrv"
@@ -344 +346 @@
              */
 #ifdef VBOX_WITH_HARDENING
-            rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO,
+            rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME_SYS, S_IFCHR, 0 /*minor*/, DDI_PSEUDO,
                                             0, NULL, NULL, 0600);
 #else
-            rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO,
+            rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME_SYS, S_IFCHR, 0 /*minor*/, DDI_PSEUDO,
                                             0, "none", "none", 0666);
 #endif
             if (rc == DDI_SUCCESS)
             {
+                rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME_USR, S_IFCHR, 1 /*minor*/, DDI_PSEUDO,
+                                                0, "none", "none", 0666);
+                if (rc == DDI_SUCCESS)
+                {
 #ifdef USE_SESSION_HASH
-                pState->pDip = pDip;
+                    pState->pDip = pDip;
 #endif
-                ddi_report_dev(pDip);
-                return DDI_SUCCESS;
+                    ddi_report_dev(pDip);
+                    return DDI_SUCCESS;
+                }
+                ddi_remove_minor_node(pDip, NULL);
             }
 
@@ -434 +442 @@
 
 /**
- * User context entry points
+ * open() worker.
  */
 static int VBoxDrvSolarisOpen(dev_t *pDev, int fFlag, int fType, cred_t *pCred)
 {
+    const bool          fUnrestricted = getminor(*devp) == 0;
+    PSUPDRVSESSION      pSession;
     int                 rc;
-    PSUPDRVSESSION      pSession;
+
     LogFlowFunc(("VBoxDrvSolarisOpen: pDev=%p:%#x\n", pDev, *pDev));
+
+    /*
+     * Validate input
+     */
+    if (   (getminor(*devp) != 0 && getminor(*devp) != 1)
+        || fType != OTYP_CHR)
+        return EINVAL; /* See mmopen for precedent. */
 
 #ifndef USE_SESSION_HASH
@@ -469 +486 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, fUnrestricted, &pSession);
     if (RT_SUCCESS(rc))
     {
@@ -491 +508 @@
      * in VBoxDrvSolarisIOCtlSlow() while calling supdrvIOCtl()
      */
-    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, true /*fUnrestricted*/, &pSession);
+    rc = supdrvCreateSession(&g_DevExt, true /* fUser */, fUnrestricted, &pSession);
     if (RT_SUCCESS(rc))
     {
@@ -502 +519 @@
          * Insert it into the hash table.
          */
+# error "Only one entry per process!"
         iHash = SESSION_HASH(pSession->Process);
         RTSpinlockAcquire(g_Spinlock);
@@ -659 +677 @@
     const unsigned      iHash = SESSION_HASH(Process);
     PSUPDRVSESSION      pSession;
+    const bool          fUnrestricted = getminor(Dev) == 0;
 
     /*
@@ -665 +684 @@
     RTSpinlockAcquire(g_Spinlock);
     pSession = g_apSessionHashTab[iHash];
-    if (pSession && pSession->Process != Process)
-    {
-        do pSession = pSession->pNextHash;
-        while (pSession && pSession->Process != Process);
-    }
+    while (pSession && pSession->Process != Process && pSession->fUnrestricted == fUnrestricted);
+        pSession = pSession->pNextHash;
     RTSpinlockReleaseNoInts(g_Spinlock);
     if (!pSession)
     {
-        LogRel(("VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n",
-                    (int)Process, Cmd));
+        LogRel(("VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x Dev=%#x\n",
+                    (int)Process, Cmd, (int)Dev));
         return EINVAL;
     }
@@ -683 +699 @@
      * the session and iCmd, and only returns a VBox status code.
      */
-    if (    Cmd == SUP_IOCTL_FAST_DO_RAW_RUN
-        ||  Cmd == SUP_IOCTL_FAST_DO_HM_RUN
-        ||  Cmd == SUP_IOCTL_FAST_DO_NOP)
+    if (   (   Cmd == SUP_IOCTL_FAST_DO_RAW_RUN
+            || Cmd == SUP_IOCTL_FAST_DO_HM_RUN
+            || Cmd == SUP_IOCTL_FAST_DO_NOP)
+        && pSession->fUnrestricted)
     {
         *pVal = supdrvIOCtlFast(Cmd, pArgs, &g_DevExt, pSession);