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

Timestamp:

Aug 28, 2014 3:18:46 PM (10 years ago)

Author:

vboxsync

Message:

Devices/USB: Fix crash on Linux hosts, a hang when disconnecting a USB device while there is a transfer active and crash upon VM termination if a device with isochronous input endpoints was attached to the VM

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (2 diffs)
• linux/USBProxyDevice-linux.cpp (modified) (1 diff)

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

@@ -1228 +1228 @@
         vusbMsgFreeExtraData(pDev->aPipes[i].pCtrl);
         RTCritSectDelete(&pDev->aPipes[i].CritSectCtrl);
+
+        if (pDev->aPipes[i].hReadAhead)
+        {
+            vusbReadAheadStop(pDev->aPipes[i].hReadAhead);
+            pDev->aPipes[i].hReadAhead = NULL;
+        }
     }
     memset(pDev->aPipes, 0, sizeof(pDev->aPipes));
@@ -1609 +1615 @@
         rc = RTReqQueueCallV(pDev->hReqQueueSync, &hReq, 0 /* cMillies */, fReqFlags, pfnFunction, cArgs, Args);
         Assert(RT_SUCCESS(rc) || rc == VERR_TIMEOUT);
+
         vusbDevUrbIoThreadWakeup(pDev);
-
-        if (fFlags & VUSB_DEV_IO_THREAD_EXEC_FLAGS_SYNC)
+        if (   rc == VERR_TIMEOUT
+            && (fFlags & VUSB_DEV_IO_THREAD_EXEC_FLAGS_SYNC))
         {
             rc = RTReqWait(hReq, RT_INDEFINITE_WAIT);
             AssertRC(rc);
         }
+        RTReqRelease(hReq);
     }
     else

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -1653 +1653 @@
         {
             /* unlink from the pending delivery list */
-            RTListNodeRemove(&pDevLnx->ListTaxing);
+            RTListNodeRemove(&pUrbLnx->NodeList);
 
             /* temporarily into the active list, so free works right. */