Changeset 90771 in vbox for trunk

Timestamp:

Aug 21, 2021 1:36:55 AM (3 years ago)

Author:

vboxsync

Message:

VBoxSVC/Performance: Stop the time before destroying unregistered metric. Asan found a use-after free.

File:

• trunk/src/VBox/Main/src-server/PerformanceImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/PerformanceImpl.cpp

@@ -221 +221 @@
     }
 
+    /* Destroy resource usage sampler first, as the callback will access the metrics. */
+    int vrc = RTTimerLRDestroy(m.sampler);
+    AssertMsgRC(vrc, ("Failed to destroy resource usage sampling timer (%Rra)\n", vrc));
+    m.sampler = NULL;
+
     /* Destroy unregistered metrics */
     BaseMetricList::iterator it;
@@ -238 +243 @@
      */
     m.gm->destroyUnregistered();
-
-    /* Destroy resource usage sampler */
-    int vrc = RTTimerLRDestroy(m.sampler);
-    AssertMsgRC(vrc, ("Failed to destroy resource usage sampling timer (%Rra)\n", vrc));
-    m.sampler = NULL;
 
     /* Invalidate the magic now. */