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

Timestamp:

Oct 22, 2015 8:19:30 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103579

Message:

VUSB: Clear pDev->pvArgs before changing the state of the device to eliminate a possible race where a second reset has pDev->pvArgs reset while the first one is not yet complete

File:

• trunk/src/VBox/Devices/USB/VUSBDevice.cpp (modified) (4 diffs)

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

@@ -1357 +1357 @@
     Assert(pDev->pUsbIns == pUsbIns);
 
+    AssertPtr(pArgs);
+
     /*
      * Reset-done processing and cleanup.
      */
+    pDev->pvArgs = NULL;
     vusbDevResetDone(pDev, pArgs->rc, pArgs->pfnDone, pArgs->pvUser);
-    pDev->pvArgs = NULL;
     RTMemFree(pArgs);
 }
@@ -1378 +1380 @@
     if (pDev->pUsbIns->pReg->pfnUsbReset)
         rc = pDev->pUsbIns->pReg->pfnUsbReset(pDev->pUsbIns, fResetOnLinux);
+
+    if (pArgs)
+    {
+        pArgs->rc = rc;
+        rc = VINF_SUCCESS;
+    }
 
     if (fUseTimer)
@@ -1388 +1396 @@
         int rc2 = TMTimerSet(pDev->pResetTimer, u64EndTS);
         AssertReleaseRC(rc2);
-    }
-
-    if (pArgs)
-    {
-        pArgs->rc = rc;
-        rc = VINF_SUCCESS;
     }
 
@@ -1460 +1462 @@
             pArgs->pvUser  = pvUser;
             pArgs->rc      = VINF_SUCCESS;
+            AssertPtrNull(pDev->pvArgs);
             pDev->pvArgs   = pArgs;
             int rc = vusbDevIoThreadExec(pDev, 0 /* fFlags */, (PFNRT)vusbDevResetWorker, 4, pDev, fResetOnLinux, true, pArgs);