Changeset 99367 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Apr 10, 2023 6:51:21 PM (20 months ago)

Author:

vboxsync

Message:

OHCI: More thorough cleanup of URB in-flight tracking.

File:

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

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

@@ -2050 +2050 @@
 
 /**
+ * Clear any possible leftover traces of a URB from the in-flight tracking.
+ * Useful if broken guests confuse the tracking logic by using the same TD
+ * for multiple URBs. See @bugref{10410}.
+ *
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
+ * @param   pUrb        The URB.
+ */
+static void ohciR3InFlightClearUrb(POHCICC pThisCC, PVUSBURB pUrb)
+{
+    unsigned i = 0;
+    while (i < RT_ELEMENTS(pThisCC->aInFlight))
+    {
+        if (pThisCC->aInFlight[i].pUrb == pUrb)
+        {
+            Log2(("ohciR3InFlightClearUrb: clearing leftover URB!!\n"));
+            pThisCC->aInFlight[i].GCPhysTD = 0;
+            pThisCC->aInFlight[i].pUrb = NULL;
+            pThisCC->cInFlight--;
+        }
+        i++;
+    }
+}
+
+
+/**
  * Removes all TDs associated with a URB from the in-flight tracking.
  *
@@ -2067 +2092 @@
                 cFramesInFlight = -1;
     }
+    ohciR3InFlightClearUrb(pThisCC, pUrb);
     return cFramesInFlight;
 }