Changeset 55414 in vbox

Timestamp:

Apr 23, 2015 8:31:35 PM (9 years ago)

Author:

vboxsync

Message:

USB,EHCI,OHCI: release and reacquire the critical section when submitting a new URB, fixes lock order violation

File:

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

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

@@ -2764 +2764 @@
          pUrb->pszDesc, TdAddr, EdAddr, pUrb->cbData));
 
+    RTCritSectLeave(&pThis->CritSect);
     int rc = VUSBIRhSubmitUrb(pThis->RootHub.pIRhConn, pUrb, &pThis->RootHub.Led);
+    RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
         return true;
@@ -2928 +2930 @@
     Log(("%s: ohciServiceTdMultiple: submitting cbData=%#x EdAddr=%#010x cTds=%d TdAddr0=%#010x\n",
          pUrb->pszDesc, pUrb->cbData, EdAddr, cTds, TdAddr));
+    RTCritSectLeave(&pThis->CritSect);
     int rc = VUSBIRhSubmitUrb(pThis->RootHub.pIRhConn, pUrb, &pThis->RootHub.Led);
+    RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
         return true;
@@ -3152 +3156 @@
     Log(("%s: ohciServiceIsochronousTd: submitting cbData=%#x cIsocPkts=%d EdAddr=%#010x TdAddr=%#010x SF=%#x (%#x)\n",
          pUrb->pszDesc, pUrb->cbData, pUrb->cIsocPkts, EdAddr, ITdAddr, pITd->HwInfo & ITD_HWINFO_SF, pThis->HcFmNumber));
+    RTCritSectLeave(&pThis->CritSect);
     int rc = VUSBIRhSubmitUrb(pThis->RootHub.pIRhConn, pUrb, &pThis->RootHub.Led);
+    RTCritSectEnter(&pThis->CritSect);
     if (RT_SUCCESS(rc))
         return true;