diff mbox series

[Concept,24/37] mcheck: integrate mcheck into dlmalloc.c

Message ID	20251201170529.3237986-25-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Mon, 1 Dec 2025 10:05:03 -0700 Message-ID: <20251201170529.3237986-25-sjg@u-boot.org> In-Reply-To: <20251201170529.3237986-1-sjg@u-boot.org> References: <20251201170529.3237986-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: HNNS4VYV3BWBDGY424JELV346VUD7OQR CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Eugene Uriev <eugeneuriev@gmail.com>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 24/37] mcheck: integrate mcheck into dlmalloc.c Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/HNNS4VYV3BWBDGY424JELV346VUD7OQR/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	malloc: Import dlmalloc 2.8.6 \| [Concept,00/37] malloc: Import dlmalloc 2.8.6 [Concept,01/37] test: hooks: Add a symlink for tasman [Concept,02/37] treewide: Add missing string.h includes [Concept,03/37] imx8mp: Increase the BSS limit for a few boards [Concept,04/37] test: Use TOTAL_MALLOC_LEN for abuf and alist tests [Concept,05/37] malloc: Rename dlmalloc.c to dlmalloc_old.c [Concept,06/37] malloc: Rename malloc.h to malloc_old.h [Concept,07/37] malloc: Import dlmalloc 2.8.6 [Concept,08/37] malloc: Add mem_malloc_init() and sbrk() [Concept,09/37] malloc: Add U-Boot configuration for dlmalloc 2.8.6 [Concept,10/37] malloc: Fix assert warning [Concept,11/37] malloc: return NULL if not initialized yet [Concept,12/37] Add a simple malloc() implementation for pre-relocation [Concept,13/37] malloc: Enable assertions if UNIT_TEST is enabled [Concept,14/37] malloc: Reduce code size with INSECURE and NO_MALLINFO [Concept,15/37] malloc: work around some memalign fragmentation issues [Concept,16/37] malloc: use hidden visibility [Concept,17/37] dlmalloc: calloc: fix zeroing early allocations [Concept,18/37] sandbox: Use a prefix for all allocation functions [Concept,19/37] malloc: Annotate allocator for valgrind [Concept,20/37] test: Support testing malloc() failures [Concept,21/37] dlmalloc: Fix a warning with clang-15 [Concept,22/37] mcheck: prepare +1 tier for mcheck-wrappers, in dl-*alloc commands [Concept,23/37] mcheck: Use memset/memcpy instead of MALLOC_ZERO/MALLOC_COPY for mcheck. [Concept,24/37] mcheck: integrate mcheck into dlmalloc.c [Concept,25/37] mcheck: support memalign [Concept,26/37] mcheck: add pedantic mode support [Concept,27/37] malloc: Avoid defining calloc() [Concept,28/37] malloc: Set up the malloc() state in mem_malloc_init() [Concept,29/37] malloc: Allow building dlmalloc with SPL_SYS_MALLOC_SIMPLE [Concept,30/37] malloc: Add a way to control the size of dlmalloc [Concept,31/37] malloc: Add NO_REALLOC_IN_PLACE option to reduce code size [Concept,32/37] malloc: Add NO_TREE_BINS option to reduce code size [Concept,33/37] malloc: Add SIMPLE_MEMALIGN to simplify memalign for code size [Concept,34/37] malloc: Add SMALLCHUNKS_AS_FUNCS to convert macros to funcs [Concept,35/37] test: Add some tests for dlmalloc [Concept,36/37] malloc: Switch to the new malloc() implementation [Concept,37/37] doc: Add malloc documentation

Commit Message

Simon Glass Dec. 1, 2025, 5:05 p.m. UTC

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

Add mcheck wrapper functions for dlmalloc, dlfree, dlrealloc,
dlmemalign, and dlcalloc. When MCHECK_HEAP_PROTECTION is enabled,
these wrappers call the mcheck hooks around the internal *_impl
functions to provide heap corruption detection.

Also add the mcheck() and mprobe() API functions.

Changes from original commit:
- Adapted for dlmalloc 2.8.6 function names (dl* instead of mALLOc)
- Updated function signatures (void* instead of Void_t*)

Signed-off-by: Eugene Uriev <eugeneuriev@gmail.com>
Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
(cherry picked from commit 151493a875071448e2582489f6fa84d1630b3368)
---

 common/dlmalloc.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff mbox series

Patch

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index 4f88e48f4b0..102b6c2bf8d 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -5591,6 +5591,69 @@  size_t dlmalloc_usable_size(const void* mem) {
   return 0;
 }
 
+#ifdef MCHECK_HEAP_PROTECTION
+#include "mcheck_core.inc.h"
+
+void *dlmalloc(size_t bytes)
+{
+	size_t fullsz = mcheck_alloc_prehook(bytes);
+	void *p = dlmalloc_impl(fullsz);
+
+	if (!p)
+		return p;
+	return mcheck_alloc_posthook(p, bytes);
+}
+
+void dlfree(void *mem) { dlfree_impl(mcheck_free_prehook(mem)); }
+
+void *dlrealloc(void *oldmem, size_t bytes)
+{
+	if (bytes == 0) {
+		if (oldmem)
+			dlfree(oldmem);
+		return NULL;
+	}
+
+	if (oldmem == NULL)
+		return dlmalloc(bytes);
+
+	void *p = mcheck_reallocfree_prehook(oldmem);
+	size_t newsz = mcheck_alloc_prehook(bytes);
+
+	p = dlrealloc_impl(p, newsz);
+	if (!p)
+		return p;
+	return mcheck_alloc_noclean_posthook(p, bytes);
+}
+
+void *dlmemalign(size_t alignment, size_t bytes)
+{
+	return NULL;
+}
+
+/* dlpvalloc, dlvalloc redirect to dlmemalign, so they need no wrapping */
+
+void *dlcalloc(size_t n, size_t elem_size)
+{
+	/* NB: no overflow check here */
+	size_t fullsz = mcheck_alloc_prehook(n * elem_size);
+	void *p = dlcalloc_impl(1, fullsz);
+
+	if (!p)
+		return p;
+	return mcheck_alloc_noclean_posthook(p, n * elem_size);
+}
+
+/* mcheck API */
+int mcheck(mcheck_abortfunc_t f)
+{
+	mcheck_initialize(f, 0);
+	return 0;
+}
+
+enum mcheck_status mprobe(void *__ptr) { return mcheck_mprobe(__ptr); }
+#endif /* MCHECK_HEAP_PROTECTION */
+
 #endif /* !ONLY_MSPACES */
 
 /* ----------------------------- user mspaces ---------------------------- */