Changeset 79786 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2019 11:08:36 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/lockvalidator: Must serialize for detection before calling rtLockValidatorDeadlockDetection since it's worker (rtLockValidatorDdDoDetection) accesses volatile structures like RTLOCKVALRECSHRD::Shared.papOwners that can be reallocated to make room for more entries.

File:

• trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -3373 +3373 @@
                  || pRecU->Excl.hClass->cMsMinDeadlock > RT_INDEFINITE_WAIT))
         rc = VINF_SUCCESS;
-    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+    else
+    {
+        rtLockValidatorSerializeDetectionEnter();
+        if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+            rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+        rtLockValidatorSerializeDetectionLeave();
+    }
 
     if (RT_SUCCESS(rc))
@@ -3675 +3680 @@
                  || pRec->hClass->cMsMinDeadlock > cMillies))
         rc = VINF_SUCCESS;
-    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+    else
+    {
+        rtLockValidatorSerializeDetectionEnter();
+        if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+            rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+        rtLockValidatorSerializeDetectionLeave();
+    }
 
     if (RT_SUCCESS(rc))