Changeset 36958 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 4, 2011 2:50:32 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB: better permissions checking and code cleanup

Location:

trunk/src/VBox/Main/src-server/linux

Files:

• USBGetDevices.cpp (modified) (3 diffs)
• USBProxyServiceLinux.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -93 +93 @@
     { "s",  1, 1000,       0 },
     { "",   0,    0,       0 }  /* term */
-};
-
-/**
- * List of well-known USB device tree locations.
- */
-static const USBDEVTREELOCATION s_aTreeLocations[] =
-{
-    { "/dev/vboxusb",  true },
-    { "/proc/bus/usb", false },
 };
 
@@ -1401 +1392 @@
 /** Is inotify available and working on this system?  This is a requirement
  * for using USB with sysfs */
-/** @todo test the "inotify in glibc but not in the kernel" case. */
 static bool inotifyAvailable(void)
 {
@@ -1416 +1406 @@
 }
 
-PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs)
-{
-    PCUSBDEVTREELOCATION pcBestUsbfs = NULL;
-    PCUSBDEVTREELOCATION pcBestSysfs = NULL;
-
-    bool fHaveInotify = inotifyAvailable();
-    for (unsigned i = 0; i < RT_ELEMENTS(s_aTreeLocations); ++i)
-        if (!s_aTreeLocations[i].fUseSysfs)
-        {
-            if (!pcBestUsbfs)
-            {
-                PUSBDEVICE pDevices;
-
-                pDevices = getDevicesFromUsbfs(s_aTreeLocations[i].szDevicesRoot,
-                                               true);
-                if (pDevices)
-                {
-                    pcBestUsbfs = &s_aTreeLocations[i];
-                    deviceListFree(&pDevices);
-                }
-            }
-        }
-        else
-        {
-            if (   fHaveInotify
-                && !pcBestSysfs
-                && RTPathExists(s_aTreeLocations[i].szDevicesRoot))
-                pcBestSysfs = &s_aTreeLocations[i];
-        }
-    if (pcBestUsbfs && !fPreferSysfs)
-        return pcBestUsbfs;
-    return pcBestSysfs;
+bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot, bool fIsDeviceNodes)
+{
+    bool fOK = false;
+    if (!fIsDeviceNodes)  /* usbfs */
+    {
+        PUSBDEVICE pDevices;
+
+        pDevices = getDevicesFromUsbfs(pcszRoot, true);
+        if (pDevices)
+        {
+            PUSBDEVICE pDevice;
+            
+            fOK = true;
+            for (pDevice = pDevices; pDevice && fOK; pDevice = pDevice->pNext)
+                if (access(pDevice->pszAddress, R_OK | W_OK))
+                    fOK = false;
+            deviceListFree(&pDevices);
+        }
+    }
+    else  /* device nodes */
+        if (inotifyAvailable() && !access(pcszRoot, R_OK | X_OK))
+            fOK = true;
+    return fOK;
 }
 

trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp

@@ -32 +32 @@
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
+#include <iprt/dir.h>
 #include <iprt/env.h>
 #include <iprt/file.h>
@@ -82 +83 @@
     /*
      * We have two methods available for getting host USB device data - using
-     * USBFS and using sysfs/hal.  The default choice depends on build-time
+     * USBFS and using sysfs.  The default choice depends on build-time
      * settings and an environment variable; if the default is not available
      * we fall back to the second.
@@ -88 +89 @@
      * will be presented to the user.
      */
-#ifdef VBOX_WITH_SYSFS_BY_DEFAULT
-    bool fUseSysfs = true;
-#else
-    bool fUseSysfs = false;
-#endif
+    bool fUseSysfs;
     const char *pcszUsbFromEnv = RTEnvGet("VBOX_USB");
     const char *pcszUsbRoot = NULL;
@@ -121 +118 @@
     if (!pcszUsbRoot)
     {
-        PCUSBDEVTREELOCATION pLocation;
-        pLocation = USBProxyLinuxGetDeviceRoot(fUseSysfs);
-        if (pLocation)
-        {
-            pcszUsbRoot = pLocation->szDevicesRoot;
-            fUseSysfs = pLocation->fUseSysfs;
+        if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
+        {
+            fUseSysfs = true;
+            pcszUsbRoot = "/dev/vboxusb";
+        }
+        else if (USBProxyLinuxCheckDeviceRoot("/proc/bus/usb", false))
+        {
+            fUseSysfs = false;
+            pcszUsbRoot = "/proc/bus/usb";
         }
     }
@@ -141 +141 @@
     }
     else
-        mLastError = VERR_NOT_FOUND;
+        /** @todo fix this, preferably in the next fifteen minutes. */
+        mLastError =   RTDirExists("/dev/vboxusb") ? VERR_PERMISSION_DENIED
+                     : RTFileExists("/proc/bus/usb/devices") ? VERR_VUSB_USBFS_PERMISSION
+                     : VERR_NOT_FOUND;
     return S_OK;
 }