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

Timestamp:

Aug 1, 2023 5:34:48 PM (18 months ago)

Author:

vboxsync

Message:

include/VBox/usbfilter.h,HostDrivers/VBoxUSB/USBFilter: IUSBDeviceFilter:
USB device interval filters don't work. bugref:10452

Main/Host,Main/USBDeviceFilter: Adding or removing global USB device
filters causes memory corruption wihch can lead to a deadlock or a SEGV
as the list of global USB device filters (llChildren) changes while
the list is being walked.

Frontends/VBoxManage: 'VBoxManage list usbfilters' doesn't display the
'Port' value of the device filter.

Frontends/VBoxManage: 'VBoxManage add usbfilter' and 'VBoxManage modify
usbfilter' both ignore the --product="Value" option.

Main/VirtualBox.xidl: Improve the IUSBDeviceFilter wording to make
things clearer in the 'VirtualBox Programming Guide and Reference Guide'
aka SDKRef.pdf.

HostDrivers/VBoxUSB/testcase/tstUSBFilter: Include a variety of USB
device filter entries which include the 'int:' prefix to fully exercise
the interval filter parsing code.

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (2 diffs)
• USBDeviceFilterImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -217 +217 @@
 
 #ifdef VBOX_WITH_USB
-    USBDeviceFilterList     llChildren;                 // all USB device filters
+    USBDeviceFilterList     llChildren;                 // all global USB device filters
     USBDeviceFilterList     llUSBDeviceFilters;         // USB device filters in use by the USB proxy service
 
@@ -535 +535 @@
 
 #ifdef VBOX_WITH_USB
-    /* uninit all USB device filters still referenced by clients
-     * Note! HostUSBDeviceFilter::uninit() will modify llChildren.
-     * This list should be already empty, but better be safe than sorry. */
-    while (!m->llChildren.empty())
-    {
-        ComObjPtr<HostUSBDeviceFilter> &pChild = m->llChildren.front();
-        pChild->uninit();
-        m->llChildren.pop_front();
+    /* Clean up the list of global USB device filters. */
+    if (!m->llChildren.empty())
+    {
+        /*
+         * i_removeChild() modifies llChildren so we make a copy to traverse here. The
+         * removal of a global USB device filter from the llChildren list at this point
+         * in Host:uninit() will trigger HostUSBDeviceFilter::FinalRelease() ->
+         * HostUSBDeviceFilter::uninit() which will complete the remainder of the clean-up
+         * for each global USB device filter and thus we don't need to call
+         * HostUSBDeviceFilter::uninit() directly here ourselves.
+         */
+        USBDeviceFilterList llChildrenCopy(m->llChildren);
+        for (USBDeviceFilterList::iterator it = llChildrenCopy.begin();
+            it != llChildrenCopy.end();
+            ++it)
+            i_removeChild(*it);
     }
 

trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp

@@ -976 +976 @@
     bd.free();
 
-    mParent->i_removeChild(this);
-
     unconst(mParent) = NULL;
 }