Changeset 76684 in vbox for trunk/src

Timestamp:

Jan 7, 2019 4:40:25 PM (6 years ago)

Author:

vboxsync

Message:

Reapply r127987 and r127988 (USB: Teardown the I/O thread and sync request queue during detach to prevent the I/O thread from accessing the roothub member which was cleared already)

File:

• trunk/src/VBox/Devices/USB/VUSBDevice.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1238 +1238 @@
     pDev->pHub->pOps->pfnDetach(pDev->pHub, pDev);
     pDev->i16Port = -1;
+
+    /*
+     * Destroy I/O thread and request queue last because they might still be used
+     * when cancelling URBs.
+     */
+    vusbDevUrbIoThreadDestroy(pDev);
+
+    int rc = RTReqQueueDestroy(pDev->hReqQueueSync);
+    AssertRC(rc);
+    pDev->hReqQueueSync = NIL_RTREQQUEUE;
+
     vusbDevSetState(pDev, VUSB_DEVICE_STATE_DETACHED);
     pDev->pHub = NULL;
@@ -1267 +1278 @@
         RTCritSectDelete(&pDev->aPipes[i].CritSectCtrl);
     }
-
-    /*
-     * Destroy I/O thread and request queue last because they might still be used
-     * when cancelling URBs.
-     */
-    vusbDevUrbIoThreadDestroy(pDev);
-
-    int rc = RTReqQueueDestroy(pDev->hReqQueueSync);
-    AssertRC(rc);
 
     if (pDev->hSniffer != VUSBSNIFFER_NIL)