diff mbox series

[Concept,21/35] malloc: Move mcheck block after includes

Message ID	20251210000737.180797-22-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Tue, 9 Dec 2025 17:07:12 -0700 Message-ID: <20251210000737.180797-22-sjg@u-boot.org> In-Reply-To: <20251210000737.180797-1-sjg@u-boot.org> References: <20251210000737.180797-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: LIDAFBISFOSDZMQULKSWYHNGR7XE72OL CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 21/35] malloc: Move mcheck block after includes Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/LIDAFBISFOSDZMQULKSWYHNGR7XE72OL/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	malloc: Add heap debugging commands and mcheck caller tracking \| [Concept,00/35] malloc: Add heap debugging commands and mcheck caller tracking [Concept,01/35] watchdog: Unregister cyclic on device removal [Concept,03/35] test: dm: Fix memory leaks in test drivers [Concept,04/35] test: dm: Fix delta usage in dm_test_devres_free() [Concept,05/35] mmc: sandbox: Fix memory leak on probe failure [Concept,06/35] video: truetype: Use pre-allocated buffer for glyph rendering [Concept,07/35] lib: Add format_size() to format sizes as strings [Concept,08/35] test: Add ut_asserteq_regex() for regex pattern matching [Concept,09/35] test: Show the required size when console-record overflows [Concept,10/35] malloc: Use mcheck.h header instead of local declaration [Concept,11/35] malloc: Make mcheck respect REALLOC_ZERO_BYTES_FREES [Concept,12/35] backtrace: Use a static buffer in backtrace_ctx for symbols [Concept,13/35] backtrace: Add backtrace_str() for condensed backtrace output [Concept,14/35] malloc: Fix unused internal_memalign warning with mcheck [Concept,15/35] malloc: Add malloc_get_info() to retrieve memory statistics [Concept,16/35] malloc: Add a Kconfig option for debugging malloc() [Concept,17/35] malloc: Enable stats if UNIT_TEST or MALLOC_DEBUG [Concept,18/35] malloc: Add 'malloc' command with 'info' subcommand [Concept,19/35] malloc: Add call counters for malloc, free, realloc [Concept,20/35] malloc: Add a Kconfig option for heap protection [Concept,21/35] malloc: Move mcheck block after includes [Concept,22/35] malloc: Fix internal calls and memalign for mcheck [Concept,23/35] malloc: Update the valloc functions to use mcheck wrappers [Concept,24/35] malloc: Increase the mcheck registry size [Concept,25/35] sandbox: Enable mcheck heap protection [Concept,26/35] malloc: Remove warning messages during relocation [Concept,27/35] malloc: Support storing caller information [Concept,28/35] malloc: Add a caller-info parameter to dlmalloc_impl() [Concept,29/35] malloc: Add malloc dump command to walk the heap [Concept,30/35] malloc: Fix malloc_dump to find mcheck headers in memalign chunks [Concept,31/35] malloc: Record caller backtrace for each allocation [Concept,32/35] malloc: Skip backtrace when stack is corrupted [Concept,33/35] malloc: Show caller info for freed chunks in malloc_dump [Concept,34/35] malloc: Print mcheck registry-overflow message only once [Concept,35/35] doc: malloc: Document debugging features

Commit Message

Simon Glass Dec. 10, 2025, 12:07 a.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

Move the CONFIG_MCHECK_HEAP_PROTECTION block after the standard
includes so that size_t and string functions are available for
the inline MALLOC_ZERO and MALLOC_COPY functions.

Add the <string.h> and <linux/types.h> includes needed for mcheck.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 common/dlmalloc.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff mbox series

Patch

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 7258a7dda84..f59b1151606 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -572,21 +572,6 @@  MAX_RELEASE_CHECK_RATE   default: 4095 unless not HAVE_MMAP
 #define DEBUG 1
 #endif
 
-#if CONFIG_IS_ENABLED(MCHECK_HEAP_PROTECTION)
-#define STATIC_IF_MCHECK static
-#undef MALLOC_COPY
-#undef MALLOC_ZERO
-static inline void MALLOC_ZERO(void *p, size_t sz) { memset(p, 0, sz); }
-static inline void MALLOC_COPY(void *dest, const void *src, size_t sz) { memcpy(dest, src, sz); }
-#else
-#define STATIC_IF_MCHECK
-#define dlmalloc_impl dlmalloc
-#define dlfree_impl dlfree
-#define dlrealloc_impl dlrealloc
-#define dlmemalign_impl dlmemalign
-#define dlcalloc_impl dlcalloc
-#endif
-
 #define LACKS_FCNTL_H
 #define LACKS_UNISTD_H
 #define LACKS_SYS_PARAM_H
@@ -633,12 +618,29 @@  static inline void MALLOC_COPY(void *dest, const void *src, size_t sz) { memcpy(
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <string.h>
 #include <vsprintf.h>
 #include <asm/global_data.h>
+#include <linux/types.h>
 #include <valgrind/memcheck.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if CONFIG_IS_ENABLED(MCHECK_HEAP_PROTECTION)
+#define STATIC_IF_MCHECK static
+#undef MALLOC_COPY
+#undef MALLOC_ZERO
+static inline void MALLOC_ZERO(void *p, size_t sz) { memset(p, 0, sz); }
+static inline void MALLOC_COPY(void *dest, const void *src, size_t sz) { memcpy(dest, src, sz); }
+#else
+#define STATIC_IF_MCHECK
+#define dlmalloc_impl dlmalloc
+#define dlfree_impl dlfree
+#define dlrealloc_impl dlrealloc
+#define dlmemalign_impl dlmemalign
+#define dlcalloc_impl dlcalloc
+#endif
+
 static bool malloc_testing;	/* enable test mode */
 static int malloc_max_allocs;	/* return NULL after this many calls to malloc() */