Changeset 38017 in vbox for trunk

Timestamp:

Jul 18, 2011 1:24:08 PM (13 years ago)

Author:

vboxsync

Message:

USB/Solaris: vboxuser group access constraint for USB devices.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

@@ -286 +286 @@
     int                     fPoll;           /* Polling status flag */
     RTPROCESS               Process;         /* The process (id) of the session */
-    bool                    fInstanceOpen;   /* If the process is still holding this instance */
     VBOXUSBREQ_CLIENT_INFO  ClientInfo;      /* Registration data */
     vboxusb_power_t        *pPower;          /* Power Management */
@@ -481 +480 @@
                     pState->fPoll = VBOXUSB_POLL_OFF;
                     pState->Process = NIL_RTPROCESS;
-                    pState->fInstanceOpen = false;
                     pState->pPower = NULL;
 
@@ -848 +846 @@
     mutex_enter(&pState->Mtx);
 
-    if (pState->fInstanceOpen == false)
+    if (pState->Process == NIL_RTPROCESS)
         pState->Process = Process;
     else
@@ -888 +886 @@
      * Only one user process can open a device instance at a time.
      */
-    if (pState->fInstanceOpen == true)
-    {
-        LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen a process is already using this device instance.\n"));
-        return EBUSY;
-    }
-
     if (pState->Process != RTProcSelf())
     {
-        LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen invalid process.\n"));
+        if (pState->Process == NIL_RTPROCESS)
+            LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen No prior information about authorized process.\n"));
+        else
+            LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen Process %d is already using this device instance.\n", pState->Process));
+
+        mutex_exit(&pState->Mtx);
         return EPERM;
     }
 
     pState->fPoll = VBOXUSB_POLL_ON;
-    pState->fInstanceOpen = true;
 
     mutex_exit(&pState->Mtx);
@@ -927 +923 @@
     pState->fPoll = VBOXUSB_POLL_OFF;
     pState->Process = NIL_RTPROCESS;
-    pState->fInstanceOpen = false;
     mutex_exit(&pState->Mtx);