Changeset 104303 in vbox for trunk/src

Timestamp:

Apr 12, 2024 7:31:39 AM (10 months ago)

Author:

vboxsync

Message:

VUSB: Be more careful with what vusbR3RhGetVUsbDevByXxxRetain() returns.

File:

• trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (8 diffs)

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

@@ -1123 +1123 @@
     PVUSBDEV pDev = vusbR3RhGetVUsbDevByPortRetain(pRh, uPort, "vusbRhAbortEpByPort");
 
+    /* We expect to be called from a device like xHCI which keeps good track
+     * of device <--> port correspondence. Being called for a nonexistent
+     * device is an error.
+     */
+    AssertPtrReturn(pDev, VERR_INVALID_PARAMETER);
+
     if (pDev->pHub != pRh)
         AssertFailedReturn(VERR_INVALID_PARAMETER);
@@ -1140 +1146 @@
     PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV pDev = vusbR3RhGetVUsbDevByAddrRetain(pRh, DstAddress, "vusbRhAbortEpByAddr");
+
+    /* We expect to be called from a device like OHCI which does not
+     * keep track of device <--> address correspondence and may try to
+     * cancel an address that does not correspond to a device. If there's
+     * no device, just do nothing.
+     */
+    if (!pDev)
+        return VINF_SUCCESS;
 
     if (pDev->pHub != pRh)
@@ -1235 +1249 @@
     PVUSBROOTHUB    pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     AssertReturn(pRh, 0);
-    PVUSBDEV        pDev = vusbR3RhGetVUsbDevByPortRetain(pRh, uPort, "vusbRhUpdateIsocFrameDelta"); AssertPtr(pDev);
+    PVUSBDEV        pDev = vusbR3RhGetVUsbDevByPortRetain(pRh, uPort, "vusbRhUpdateIsocFrameDelta");
+    AssertPtrReturn(pDev, 0);
     PVUSBPIPE       pPipe = &pDev->aPipes[EndPt];
     uint32_t        *puLastFrame;
@@ -1272 +1287 @@
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV     pDev  = vusbR3RhGetVUsbDevByPortRetain(pThis, uPort, "vusbR3RhDevPowerOn");
-    AssertPtr(pDev);
+    AssertPtrReturn(pDev, VERR_VUSB_DEVICE_NOT_ATTACHED);
 
     int rc = VUSBIDevPowerOn(&pDev->IDevice);
@@ -1285 +1300 @@
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV     pDev  = vusbR3RhGetVUsbDevByPortRetain(pThis, uPort, "vusbR3RhDevPowerOff");
-    AssertPtr(pDev);
+    AssertPtrReturn(pDev, VERR_VUSB_DEVICE_NOT_ATTACHED);
 
     int rc = VUSBIDevPowerOff(&pDev->IDevice);
@@ -1298 +1313 @@
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV     pDev  = vusbR3RhGetVUsbDevByPortRetain(pThis, uPort, "vusbR3RhDevGetState");
-    AssertPtr(pDev);
+    AssertPtrReturn(pDev, VUSB_DEVICE_STATE_DETACHED);
 
     VUSBDEVICESTATE enmState = VUSBIDevGetState(&pDev->IDevice);
@@ -1311 +1326 @@
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV     pDev  = vusbR3RhGetVUsbDevByPortRetain(pThis, uPort, "vusbR3RhDevIsSavedStateSupported");
-    AssertPtr(pDev);
+    AssertPtrReturn(pDev, false);
 
     bool fSavedStateSupported = VUSBIDevIsSavedStateSupported(&pDev->IDevice);
@@ -1324 +1339 @@
     PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
     PVUSBDEV     pDev  = vusbR3RhGetVUsbDevByPortRetain(pThis, uPort, "vusbR3RhDevGetSpeed");
-    AssertPtr(pDev);
+    AssertPtrReturn(pDev, VUSB_SPEED_UNKNOWN);
 
     VUSBSPEED enmSpeed = pDev->IDevice.pfnGetSpeed(&pDev->IDevice);