Changeset 36997 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

May 6, 2011 11:30:23 PM (14 years ago)

Author:

vboxsync

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

71608

Message:

Main/linux/usb: no reason not to check root paths passed in the environment

File:

• trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp (modified) (3 diffs)

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

@@ -141 +141 @@
                     pcszUsbFromEnv));
             fValidVBoxUSB = false;
+            pcszUsbFromEnv = NULL;
         }
         if (!fValidVBoxUSB && pcszUsbRoot)
@@ -160 +161 @@
         }
     }
+    else if (!USBProxyLinuxCheckDeviceRoot(pcszUsbRoot, fSysfsChosen))
+        pcszUsbRoot = NULL;
     if (pcszUsbRoot)
     {
@@ -176 +179 @@
     }
     else
-        mLastError =   RTDirExists("/dev/vboxusb") ? VERR_VUSB_USB_DEVICE_PERMISSION
+        mLastError =   pcszUsbFromEnv ? VERR_NOT_FOUND
+                     : RTDirExists("/dev/vboxusb") ? VERR_VUSB_USB_DEVICE_PERMISSION
                      : RTFileExists("/proc/bus/usb/devices") ? VERR_VUSB_USBFS_PERMISSION
                      : VERR_NOT_FOUND;