Changeset 72613 in vbox

Timestamp:

Jun 19, 2018 1:16:32 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Call lsan_ignore_object() if must-leak or may-leak tags are use.

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/lockvalidator.cpp (modified) (2 diffs)
• r3/alloc.cpp (modified) (3 diffs)

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

@@ -1046 +1046 @@
     size_t const       cbFile   = pSrcPos->pszFile ? strlen(pSrcPos->pszFile) + 1 : 0;
     size_t const     cbFunction = pSrcPos->pszFile ? strlen(pSrcPos->pszFunction) + 1 : 0;
-    RTLOCKVALCLASSINT *pThis    = (RTLOCKVALCLASSINT *)RTMemAllocVar(sizeof(*pThis) + cbFile + cbFunction + cbName);
+    RTLOCKVALCLASSINT *pThis    = (RTLOCKVALCLASSINT *)RTMemAllocVarTag(sizeof(*pThis) + cbFile + cbFunction + cbName,
+                                                                        "may-leak:RTLockValidatorClassCreateExV");
     if (!pThis)
         return VERR_NO_MEMORY;
@@ -1097 +1098 @@
 #endif
 
-#ifdef VBOX_WITH_GCC_SANITIZER
-    __lsan_ignore_object(pThis);
-#endif
     *phClass = pThis;
     return VINF_SUCCESS;

trunk/src/VBox/Runtime/r3/alloc.cpp

@@ -86 +86 @@
 
 
+#ifdef VBOX_WITH_GCC_SANITIZER
+/**
+ * Checks if @a pszTag is a leak tag.
+ *
+ * @returns true if leak tag, false if not.
+ * @param   pszTag              Tage to inspect.
+ */
+DECLINLINE(bool) rtMemIsLeakTag(const char *pszTag)
+{
+    char ch = *pszTag;
+    if (ch != 'w')
+    { /* likely */ }
+    else
+        return pszTag[1] == 'i'
+            && pszTag[2] == 'l'
+            && pszTag[3] == 'l'
+            && pszTag[4] == '-'
+            && pszTag[5] == 'l'
+            && pszTag[6] == 'e'
+            && pszTag[7] == 'a'
+            && pszTag[8] == 'k';
+    if (ch != 'm')
+        return false;
+    return pszTag[1] == 'm'
+        && pszTag[2] == 'a'
+        && pszTag[3] == 'y'
+        && pszTag[4] == '-'
+        && pszTag[5] == 'l'
+        && pszTag[6] == 'e'
+        && pszTag[7] == 'a'
+        && pszTag[8] == 'k';
+}
+#endif /* VBOX_WITH_GCC_SANITIZER */
+
+
 RTDECL(void *)  RTMemTmpAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
 {
@@ -123 +158 @@
               , ("pv=%p RTMEM_ALIGNMENT=%#x\n", pv, RTMEM_ALIGNMENT));
 #endif /* !RTALLOC_USE_EFENCE */
+#ifdef VBOX_WITH_GCC_SANITIZER
+    if (rtMemIsLeakTag(pszTag))
+        __lsan_ignore_object(pv);
+#endif
     return pv;
 }
@@ -147 +186 @@
               , ("pv=%p RTMEM_ALIGNMENT=%#x\n", pv, RTMEM_ALIGNMENT));
 #endif /* !RTALLOC_USE_EFENCE */
+#ifdef VBOX_WITH_GCC_SANITIZER
+    if (rtMemIsLeakTag(pszTag))
+        __lsan_ignore_object(pv);
+#endif
     return pv;
 }