Changeset 36958 in vbox

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

Files:

• Main/include/USBGetDevices.h (modified) (2 diffs)
• Main/src-server/linux/USBGetDevices.cpp (modified) (3 diffs)
• Main/src-server/linux/USBProxyServiceLinux.cpp (modified) (5 diffs)
• Main/testcase/tstHostHardwareLinux.cpp (modified) (1 diff)
• Main/testcase/tstUSBProxyLinux.cpp (modified) (2 diffs)
• RDP/client/vrdp/rdpusb.c (modified) (1 diff)

trunk/src/VBox/Main/include/USBGetDevices.h

@@ -75 +75 @@
 RT_C_DECLS_BEGIN
 
-/** List of well-known USB device tree locations */
-typedef struct USBDEVTREELOCATION
-{
-    /** The root of the device tree for this location. */
-    char szDevicesRoot[256];
-    /** Whether this location requires device enumeration using sysfs. */
-    bool fUseSysfs;
-} USBDEVTREELOCATION, *PUSBDEVTREELOCATION;
-typedef const USBDEVTREELOCATION *PCUSBDEVTREELOCATION;
-
 /**
- * Get the USB device tree root
- * @param  fPreferSysfs  whether we wish to use sysfs over usbfs for
- *                       enumeration if we have the choice
- * @note   returns a pointer into a static array so it will stay valid
+ * Check whether a USB device tree root is usable
+ * @param pcszRoot        the path to the root of the device tree
+ * @param fIsDeviceNodes  whether this is a device node (or usbfs) tree
+ * @note  returns a pointer into a static array so it will stay valid
  */
-extern PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs);
+extern bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot,
+                                         bool fIsDeviceNodes);
 
 /**
@@ -97 +88 @@
  * @a deviceFree or something equivalent.
  * @param pcszDevicesRoot  the path to the root of the device tree
- * @param fUseSysfs       whether to use sysfs (or usbfs) for enumeration
+ * @param fUseSysfs        whether to use sysfs (or usbfs) for enumeration
  */
 extern PUSBDEVICE USBProxyLinuxGetDevices(const char *pcszDevicesRoot,

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;
 }

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -128 +128 @@
         RTPrintf ("\n");
     }
-    PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(false);
-    if (pcLocation && !pcLocation->fUseSysfs)
+    RTPrintf("NOTE: checking for usbfs at /dev/bus/usb, not /proc/bus/usb!!!\n");
+    if (USBProxyLinuxCheckDeviceRoot("/dev/bus/usb", false))
     {
-        PUSBDEVICE pDevice = USBProxyLinuxGetDevices(pcLocation->szDevicesRoot,
+        PUSBDEVICE pDevice = USBProxyLinuxGetDevices("/dev/bus/usb",
                                                      false);
-        printDevices(pDevice, pcLocation->szDevicesRoot, "usbfs");
+        printDevices(pDevice, "/dev/bus/usb", "usbfs");
         freeDevices(pDevice);
     }
+    else
+        RTPrintf("-> not found\n");
 #ifdef VBOX_USB_WITH_SYSFS
-    pcLocation = USBProxyLinuxGetDeviceRoot(true);
-    if (pcLocation && pcLocation->fUseSysfs)
+    RTPrintf("Testing for USB devices at /dev/vboxusb\n");
+    if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
     {
-        PUSBDEVICE pDevice = USBProxyLinuxGetDevices(pcLocation->szDevicesRoot,
+        PUSBDEVICE pDevice = USBProxyLinuxGetDevices("/dev/vboxusb",
                                                      true);
-        printDevices(pDevice, pcLocation->szDevicesRoot, "sysfs");
+        printDevices(pDevice, "/dev/vboxusb", "sysfs");
         freeDevices(pDevice);
     }
-    VBoxMainHotplugWaiter waiter(pcLocation->szDevicesRoot);
+    else
+        RTPrintf("-> not found\n");
+    VBoxMainHotplugWaiter waiter("/dev/vboxusb");
     RTPrintf ("Waiting for a hotplug event for five seconds...\n");
     doHotplugEvent(&waiter, 5000);

trunk/src/VBox/Main/testcase/tstUSBProxyLinux.cpp

@@ -62 +62 @@
 }
 
-static USBDEVTREELOCATION s_deviceRoot = { "", false };
-static bool s_fGetDeviceRootPreferSysfs = false;
+static const char *s_pcszDeviceRoot = "";
+static bool s_fIsDeviceNodes = false;
 
-PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs)
+bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot,
+                                  bool fIsDeviceNodes)
 {
-    s_fGetDeviceRootPreferSysfs = fPreferSysfs;
-    return &s_deviceRoot;
+    return (   (!strcmp(s_pcszDeviceRoot, pcszRoot))
+            && (s_fIsDeviceNodes == fIsDeviceNodes));
 }
 
@@ -153 +154 @@
         else
             RTEnvUnset("VBOX_USB_ROOT");
-        strcpy(s_deviceRoot.szDevicesRoot,
-               s_testEnvironment[i].pcszReturnedRoot);
-        s_deviceRoot.fUseSysfs = s_testEnvironment[i].fReturnedUseSysfs;
+        s_pcszDeviceRoot = s_testEnvironment[i].pcszReturnedRoot;
+        s_fIsDeviceNodes = s_testEnvironment[i].fReturnedUseSysfs;
         RTTESTI_CHECK(test.init() == S_OK);
         test.getDevices();

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -888 +888 @@
 rdpusb_init(void)
 {
-        PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(false);
-        g_fUseSysfs       = pcLocation->fUseSysfs;
-        g_pcszDevicesRoot = pcLocation->szDevicesRoot;
+    /** @todo re-use the proxy service code */
+        if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
+        {
+            g_fUseSysfs       = true;
+            g_pcszDevicesRoot = "/dev/vboxusb";
+        }
+        else
+        {
+            g_fUseSysfs       = false;
+            g_pcszDevicesRoot = "/proc/bus/usb";
+        }
         rdpusb_channel =
                 channel_register("vrdpusb", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP,