Changeset 69971 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Dec 7, 2017 11:16:53 AM (7 years ago)

Author:

vboxsync

Message:

iprt/memtracker: Add the caller address to the tracking information.

File:

• trunk/src/VBox/Runtime/common/alloc/memtracker.cpp (modified) (11 diffs)

trunk/src/VBox/Runtime/common/alloc/memtracker.cpp

@@ -505 +505 @@
  * @param   cbUser              The size requested by the user.
  * @param   pszTag              The tag string.
+ * @param   pvCaller            The return address.
  * @param   enmMethod           The allocation method.
  */
 static void *rtMemTrackerHdrAllocEx(PRTMEMTRACKERINT pTracker, void *pv, size_t cbUser,
-                                    const char *pszTag, RTMEMTRACKERMETHOD enmMethod)
+                                    const char *pszTag, void *pvCaller, RTMEMTRACKERMETHOD enmMethod)
 {
     /*
@@ -528 +529 @@
     pHdr->pszTag            = pszTag;
     pHdr->pTag              = NULL;
+    pHdr->pvCaller          = pvCaller;
     pHdr->pvUser            = pHdr + 1;
+    pHdr->uReserved         = 0;
 
     /*
@@ -579 +582 @@
  * @param   cbUser              The size of the user memory or 0.
  * @param   pszTag              The tag to associate the free with.
+ * @param   pvCaller            The return address.
  * @param   enmMethod           The free method.
  * @param   uDeadMagic          The dead magic value to use.
  */
 static void *rtMemTrackerHdrFreeCommon(PRTMEMTRACKERINT pTracker, void *pvUser, size_t cbUser,
-                                       const char *pszTag, RTMEMTRACKERMETHOD enmMethod,
+                                       const char *pszTag, void *pvCaller, RTMEMTRACKERMETHOD enmMethod,
                                        size_t uDeadMagic)
 {
@@ -633 +637 @@
 
         /** @todo we're currently ignoring pszTag, consider how to correctly
-         *        attribute the free operation if the tags differ - it
+         *        attribute the free operation if the tags differ - if it
          *        makes sense at all... */
         NOREF(pszTag);
@@ -656 +660 @@
     }
 
+    NOREF(pvCaller);  /* Intended for We may later do some use-after-free tracking. */
     return pHdr;
 }
@@ -669 +674 @@
  * @param   cbOldUser           The size of the user memory, 0 if unknown.
  * @param   pszTag              The tag string.
- */
-static void *rtMemTrackerHdrReallocPrepEx(PRTMEMTRACKERINT pTracker, void *pvOldUser, size_t cbOldUser, const char *pszTag)
+ * @param   pvCaller            The return address.
+ */
+static void *rtMemTrackerHdrReallocPrepEx(PRTMEMTRACKERINT pTracker, void *pvOldUser, size_t cbOldUser,
+                                          const char *pszTag, void *pvCaller)
 {
     if (!pvOldUser)
         return NULL;
-    return rtMemTrackerHdrFreeCommon(pTracker, pvOldUser, cbOldUser, pszTag,
+    return rtMemTrackerHdrFreeCommon(pTracker, pvOldUser, cbOldUser, pszTag, pvCaller,
                                      RTMEMTRACKERMETHOD_REALLOC_PREP, RTMEMTRACKERHDR_MAGIC_REALLOC);
 }
@@ -689 +696 @@
  * @param   pvOldUser           Pointer to the old user memory.
  * @param   pszTag              The tag string.
+ * @param   pvCaller            The return address.
  */
 static void *rtMemTrackerHdrReallocDoneEx(PRTMEMTRACKERINT pTracker, void *pvNew, size_t cbNewUser,
-                                          void *pvOldUser, const char *pszTag)
+                                          void *pvOldUser, const char *pszTag, void *pvCaller)
 {
     /* Succeeded? */
     if (pvNew)
-        return rtMemTrackerHdrAllocEx(pTracker, pvNew, cbNewUser, pszTag, RTMEMTRACKERMETHOD_REALLOC_DONE);
+        return rtMemTrackerHdrAllocEx(pTracker, pvNew, cbNewUser, pszTag, pvCaller, RTMEMTRACKERMETHOD_REALLOC_DONE);
 
     /* Failed or just realloc to zero? */
@@ -703 +711 @@
         AssertReturn(pHdr->uMagic == RTMEMTRACKERHDR_MAGIC_REALLOC, NULL);
 
-        return rtMemTrackerHdrAllocEx(pTracker, pHdr, pHdr->cbUser, pszTag, RTMEMTRACKERMETHOD_REALLOC_FAILED);
+        return rtMemTrackerHdrAllocEx(pTracker, pHdr, pHdr->cbUser, pszTag, pvCaller, RTMEMTRACKERMETHOD_REALLOC_FAILED);
     }
 
@@ -719 +727 @@
  * @param   cbUser              The size of the user memory, 0 if unknown.
  * @param   pszTag              The tag string.
+ * @param   pvCaller            The return address.
  * @param   enmMethod           The free method.
  */
 static void *rtMemTrackerHdrFreeEx(PRTMEMTRACKERINT pTracker, void *pvUser, size_t cbUser,
-                                   const char *pszTag, RTMEMTRACKERMETHOD enmMethod)
+                                   const char *pszTag, void *pvCaller, RTMEMTRACKERMETHOD enmMethod)
 {
     if (!pvUser)
         return NULL;
-    return rtMemTrackerHdrFreeCommon(pTracker, pvUser, cbUser, pszTag, enmMethod, RTMEMTRACKERHDR_MAGIC_FREE);
+    return rtMemTrackerHdrFreeCommon(pTracker, pvUser, cbUser, pszTag, pvCaller, enmMethod, RTMEMTRACKERHDR_MAGIC_FREE);
 }
 
@@ -825 +834 @@
             if (pCurHdr->pTag)
                 pOutput->pfnPrintf(pOutput,
-                                   "    %zu bytes at %p with tag %s\n"
-                                   "    %.*Rhxd\n"
+                                   "    %zu bytes at %p by %p with tag %s\n"
+                                   "%.*Rhxd\n"
                                    "\n",
-                                   pCurHdr->cbUser, pCurHdr->pvUser, pCurHdr->pTag->szTag,
+                                   pCurHdr->cbUser, pCurHdr->pvUser, pCurHdr->pvCaller, pCurHdr->pTag->szTag,
                                    RT_MIN(pCurHdr->cbUser, 16*3), pCurHdr->pvUser);
             else
                 pOutput->pfnPrintf(pOutput,
-                                   "    %zu bytes at %p without a tag\n"
-                                   "    %.*Rhxd\n"
+                                   "    %zu bytes at %p by %p without a tag\n"
+                                   "%.*Rhxd\n"
                                    "\n",
-                                   pCurHdr->cbUser, pCurHdr->pvUser,
+                                   pCurHdr->cbUser, pCurHdr->pvUser, pCurHdr->pvCaller,
                                    RT_MIN(pCurHdr->cbUser, 16*3), pCurHdr->pvUser);
         }
@@ -1214 +1223 @@
 
 
-RTDECL(void *) RTMemTrackerHdrAlloc(void *pv, size_t cb, const char *pszTag, RTMEMTRACKERMETHOD enmMethod)
+RTDECL(void *) RTMemTrackerHdrAlloc(void *pv, size_t cb, const char *pszTag, void *pvCaller, RTMEMTRACKERMETHOD enmMethod)
 {
     PRTMEMTRACKERINT pTracker = g_pDefaultTracker;
     if (RT_UNLIKELY(!pTracker))
         pTracker = rtMemTrackerLazyInitDefaultTracker();
-    return rtMemTrackerHdrAllocEx(pTracker, pv, cb, pszTag, enmMethod);
-}
-
-
-RTDECL(void *) RTMemTrackerHdrReallocPrep(void *pvOldUser, size_t cbOldUser, const char *pszTag)
+    return rtMemTrackerHdrAllocEx(pTracker, pv, cb, pszTag, pvCaller, enmMethod);
+}
+
+
+RTDECL(void *) RTMemTrackerHdrReallocPrep(void *pvOldUser, size_t cbOldUser, const char *pszTag, void *pvCaller)
 {
     PRTMEMTRACKERINT pTracker = g_pDefaultTracker;
     if (RT_UNLIKELY(!pTracker))
         pTracker = rtMemTrackerLazyInitDefaultTracker();
-    return rtMemTrackerHdrReallocPrepEx(pTracker, pvOldUser, cbOldUser, pszTag);
-}
-
-
-RTDECL(void *) RTMemTrackerHdrReallocDone(void *pvNew, size_t cbNewUser, void *pvOld, const char *pszTag)
+    return rtMemTrackerHdrReallocPrepEx(pTracker, pvOldUser, cbOldUser, pszTag, pvCaller);
+}
+
+
+RTDECL(void *) RTMemTrackerHdrReallocDone(void *pvNew, size_t cbNewUser, void *pvOld, const char *pszTag, void *pvCaller)
 {
     PRTMEMTRACKERINT pTracker = g_pDefaultTracker;
     if (RT_UNLIKELY(!pTracker))
         pTracker = rtMemTrackerLazyInitDefaultTracker();
-    return rtMemTrackerHdrReallocDoneEx(pTracker, pvNew, cbNewUser, pvOld, pszTag);
-}
-
-
-RTDECL(void *) RTMemTrackerHdrFree(void *pvUser, size_t cbUser, const char *pszTag, RTMEMTRACKERMETHOD enmMethod)
+    return rtMemTrackerHdrReallocDoneEx(pTracker, pvNew, cbNewUser, pvOld, pszTag, pvCaller);
+}
+
+
+RTDECL(void *) RTMemTrackerHdrFree(void *pvUser, size_t cbUser, const char *pszTag, void *pvCaller, RTMEMTRACKERMETHOD enmMethod)
 {
     PRTMEMTRACKERINT pTracker = g_pDefaultTracker;
     if (RT_UNLIKELY(!pTracker))
         pTracker = rtMemTrackerLazyInitDefaultTracker();
-    return rtMemTrackerHdrFreeEx(pTracker, pvUser, cbUser, pszTag, enmMethod);
+    return rtMemTrackerHdrFreeEx(pTracker, pvUser, cbUser, pszTag, pvCaller, enmMethod);
 }