Changeset 99368 in vbox for trunk/src

Timestamp:

Apr 10, 2023 6:52:44 PM (22 months ago)

Author:

vboxsync

Message:

VUSB: Better cleanup when recycling URB memory (see bugref:10140).

File:

• trunk/src/VBox/Devices/USB/VUSBUrbPool.cpp (modified) (3 diffs)

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

@@ -163 +163 @@
                 RTListNodeRemove(&pIt->NdFree);
                 ASMAtomicDecU32(&pUrbPool->cUrbsInPool);
+                pIt->cbAllocated  = 0;
+                pIt->Urb.u32Magic = 0;
+                pIt->Urb.enmState = VUSBURBSTATE_INVALID;
                 RTMemFree(pIt);
             }
@@ -185 +188 @@
         pHdr->cAge        = 0;
         ASMAtomicIncU32(&pUrbPool->cUrbsInPool);
+    }
+    else
+    {
+        /* Paranoia: Clear memory that's part of the guest data buffer now
+         * but wasn't before. See @bugref{10410}.
+         */
+        if (cbData > pHdr->Urb.cbData)
+        {
+            memset(&pHdr->Urb.abData[pHdr->Urb.cbData], 0, cbData - pHdr->Urb.cbData);
+        }
     }
     RTCritSectLeave(&pUrbPool->CritSectPool);
@@ -230 +243 @@
     {
         ASMAtomicDecU32(&pUrbPool->cUrbsInPool);
+        pHdr->cbAllocated  = 0;
+        pHdr->Urb.u32Magic = 0;
+        pHdr->Urb.enmState = VUSBURBSTATE_INVALID;
         RTMemFree(pHdr);
     }