Changeset 83298 in vbox

Timestamp:

Mar 16, 2020 1:10:10 PM (5 years ago)

Author:

vboxsync

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

136465

Message:

Audio/HDA: Added some more stream ID checks.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (1 diff)

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

@@ -3884 +3884 @@
         rc = pHlp->pfnSSMGetU8(pSSM, &idStream);
         AssertRCReturn(rc, rc);
+
+        /* Paranoia. */
+        AssertLogRelMsgReturn(idStream < HDA_MAX_STREAMS,
+                              ("HDA: Saved state contains bogus stream ID %RU8 for stream #%RU8", idStream, i),
+                              VERR_SSM_INVALID_STATE);
 
         HDASTREAM    StreamDummyShared;

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

@@ -231 +231 @@
 int hdaR3StreamSetUp(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, uint8_t uSD)
 {
+    /* This must be valid all times. */
+    AssertReturn(uSD < HDA_MAX_STREAMS, VERR_INVALID_PARAMETER);
+
     /* These member can only change on data corruption, despite what the code does further down (bird).  */
-    Assert(pStreamShared->u8SD == uSD);
-    Assert(pStreamR3->u8SD     == uSD);
+    AssertReturn(pStreamShared->u8SD == uSD, VERR_WRONG_ORDER);
+    AssertReturn(pStreamR3->u8SD     == uSD, VERR_WRONG_ORDER);
 
     const uint64_t u64BDLBase = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, uSD),