Changeset 99311 in vbox for trunk/src/VBox

Timestamp:

Apr 6, 2023 7:20:06 AM (22 months ago)

Author:

vboxsync

Message:

Audio/AC97: Acquire the mixer sink locks in ichac97R3StreamReSetUp(). bugref:10350

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (7 diffs)

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

@@ -2030 +2030 @@
     }
 
+    /** Validate locks -- see @bugref{10350}. */
+    Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
+    Assert(RTCritSectIsOwned(&pStreamCC->State.CritSect));
+    Assert(AudioMixerSinkLockIsOwned(pMixSink));
+
     /*
      * Don't continue if the frequency is out of range (the rest of the
@@ -2273 +2278 @@
  * @param   fForce      Whether to force re-opening the stream or not.
  *                      Otherwise re-opening only will happen if the PCM properties have changed.
+ *
+ * @remarks This is called holding:
+ *              -# The AC'97 device lock.
+ *
+ *          Will acquire the stream and mixer sink locks. See @bugref{10350}
  */
 static int ichac97R3StreamReSetUp(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STATER3 pThisCC,
@@ -2282 +2292 @@
     Assert(pStream   - &pThis->aStreams[0]   == pStream->u8SD);
     Assert(pStreamCC - &pThisCC->aStreams[0] == pStream->u8SD);
+
+    ichac97R3StreamLock(pStreamCC);
+    PAUDMIXSINK const pSink = ichac97R3IndexToSink(pThisCC, pStream->u8SD);
+    if (pSink)
+        AudioMixerSinkLock(pSink);
 
     ichac97R3StreamTearDown(pStream);
@@ -2289 +2304 @@
     else
         STAM_REL_PROFILE_STOP_NS(&pStreamCC->State.StatReSetUpChanged, r);
+
+    if (pSink)
+        AudioMixerSinkUnlock(pSink);
+    ichac97R3StreamUnlock(pStreamCC);
+
     return rc;
 }
@@ -2310 +2330 @@
     ichac97R3StreamLock(pStreamCC);
     PAUDMIXSINK const pSink = ichac97R3IndexToSink(pThisCC, pStream->u8SD);
-    AudioMixerSinkLock(pSink);
+    if (pSink)
+        AudioMixerSinkLock(pSink);
 
     int rc = VINF_SUCCESS;
@@ -2340 +2361 @@
 
             /* Do the actual enabling (won't fail as long as pSink is valid). */
-            rc = AudioMixerSinkStart(pSink);
+            if (pSink)
+                rc = AudioMixerSinkStart(pSink);
         }
     }
@@ -2353 +2375 @@
 
     /* Make sure to leave the lock before (eventually) starting the timer. */
-    AudioMixerSinkUnlock(pSink);
+    if (pSink)
+        AudioMixerSinkUnlock(pSink);
     ichac97R3StreamUnlock(pStreamCC);
     LogFunc(("[SD%RU8] fEnable=%RTbool, rc=%Rrc\n", pStream->u8SD, fEnable, rc));