Changeset 89412 in vbox

Timestamp:

May 31, 2021 8:14:47 PM (4 years ago)

Author:

vboxsync

Message:

DrvAudio: Fixed race condition in destructor: Must get the threads out of the way before cleaning up streams. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -4615 +4615 @@
 
     /*
-     * Note: No calls here to the driver below us anymore,
-     *       as PDM already has destroyed it.
-     *       If you need to call something from the host driver,
-     *       do this in drvAudioPowerOff() instead.
-     */
-
-    /* Thus, NULL the pointer to the host audio driver first,
-     * so that routines like drvAudioStreamDestroyInternal() don't call the driver(s) below us anymore. */
+     * We must start by setting pHostDrvAudio to NULL here as the anything below
+     * us has already been destroyed at this point.
+     */
     if (RTCritSectRwIsInitialized(&pThis->CritSectHotPlug))
     {
@@ -4635 +4630 @@
     }
 
+    /*
+     * Make sure the thread pool is out of the picture before we terminate all the streams.
+     */
+    if (pThis->hReqPool != NIL_RTREQPOOL)
+    {
+        uint32_t cRefs = RTReqPoolRelease(pThis->hReqPool);
+        Assert(cRefs == 0); RT_NOREF(cRefs);
+        pThis->hReqPool = NIL_RTREQPOOL;
+    }
+
+    /*
+     * Destroy all streams.
+     */
     if (RTCritSectRwIsInitialized(&pThis->CritSectGlobals))
     {
@@ -4668 +4676 @@
     PDMDrvHlpSTAMDeregister(pDrvIns, &pThis->Stats.TotalBytesRead);
 #endif
-
-    if (pThis->hReqPool != NIL_RTREQPOOL)
-    {
-        uint32_t cRefs = RTReqPoolRelease(pThis->hReqPool);
-        Assert(cRefs == 0); RT_NOREF(cRefs);
-        pThis->hReqPool = NIL_RTREQPOOL;
-    }
 
     LogFlowFuncLeave();