From patchwork Wed Dec 10 00:07:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 878 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765325380; bh=UPjrcgt4BKht/M2Rcde7WwacYxmIqsbZXIAoeX9O9Uo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=q/CljNlq1Q/WaBDx89Iykh2Nc+v+SriX/QHS9BSmpqn9pB0xnyAmk4Zpwl+XKIX+P AYt1MgBFYdw46kSmwfF82p0QGCHqSQDrf/8Dl4iI5a2bVTF7i1hZjuWgygVyr2AEbI jZX5DNcl2iZhrhXQos3C7jkWigEOeGL1blXXAg38Tk4yDyLxE8bU8JOgOG/wojr1ZM fHld2cDUXFqRa5kJnUVHUK4RqvMr3jTrnyieXp+IRBjKCLMPVzKgYqj5QV+gDHsX+g Vlbo2tyrGrH/yLqohiQcGQ7X04zePRXuJGmpZH9glJQNfkYl+0CS0NwDjh7kmHE7nJ mIS0TtWmZdClg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8DE1168A4B for ; Tue, 9 Dec 2025 17:09:40 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CBZ_aGZgffso for ; Tue, 9 Dec 2025 17:09:40 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765325378; bh=UPjrcgt4BKht/M2Rcde7WwacYxmIqsbZXIAoeX9O9Uo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=pv74htzhA2gUnHxpEOpWUf632ZnHIWurC+Ia++IGO7I0L+sOQmOoPWb18TAHQ4lHL O1DiSsnKh9SY4M6k0PYAjaYQOs5hcKDtgW8VeRrpU4BKQ5yFSPtZtBNAlLC4FIzO8C Fon/MCSu7q53A7dnREHalkCMZd5jMAhsM5psAbbKIqMcLWXA5+ZEgXVbNwS8IGWWer bUs3AIAuEhEsX5pn0kh0f1NEGYxDKFqHzOLKJmlFaMwq5gdxpmqCu0ib1QH1F1J2td W/N32S9EjPMQw1kgSJkgJ0s1omHo9L3+GxIOIFdgmJfi7P+b699AYZG29lrezN80qH th+mXmnb7H9iw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 92D9A68A22 for ; Tue, 9 Dec 2025 17:09:38 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765325376; bh=x38WOAXNJa05iCwbPBjWCSs42aKrRzLrrHG1G0Dl3gI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FRumRme3asvjlw/pnF5V2c2OdxBjyB9D/gOen6E2Fti1oaNrZipT1tl8cffJypReJ hr+9haHQr1iKYjnXHkL8ezH5eUjH1gILITgrml2yhmgNSvmHMgDOa5fm9Jaokc1wFz 6lBuZCfnW6Rxesy4HrcoojUlA8wethJApW6Ntd0MVRhLSK+j4YRjjeaxZoCsFLftua +0KKSrS+dnbYgWm/WKrFfsJyACZf9oGArprRkp41Ts4dByV5Q/nb69s1kRRMj7E8Gs 9WmLdxMWZ68hE06f+dn/TeGQ9EWdM3FHoySkxBbuMr7Tl0ji43479W3d18et777b02 QEupZdn4lXbuA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BFB1468972; Tue, 9 Dec 2025 17:09:36 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id igNOo-v9gLM0; Tue, 9 Dec 2025 17:09:36 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765325376; bh=MuXqGfNchGhd7eT675CzZc5ifU3jNhz+HLBmN4CCfdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLmIZAjB2bZNT8aFbgDWP6M0O87RlNw3RMn1S2nzcZXn1mjLNDnr030PVNBeS/mr3 FDrGEMezbIFO9M5aEJe1i9yeP8CyfKa5lgtnjhQqSqcXla0fx/R8jRNGJ2ounC5vk/ SwEayx+dd+ut8ir37cBZ6KxSN215lXEN+KQ2VVteqD88F7QZRujNFYAhbUXI97K2c8 5MaPqc/PJjmYg1iB+inXqk8IFCVrMK3P+rYPOpDKshjvpSYTBi1WxhH9ei/2gq/RR5 VXZgQ1sYNAFhv7tac/4dtZl43ekljAXlmfSTH9zInD1VJnprYsPojyz6ndNQ0YyR1P PtTWTq6x+4ZeQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id CA69F6884F; Tue, 9 Dec 2025 17:09:35 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Tue, 9 Dec 2025 17:07:12 -0700 Message-ID: <20251210000737.180797-22-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 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 X-Message-ID-Hash: LIDAFBISFOSDZMQULKSWYHNGR7XE72OL X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , Claude X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 21/35] malloc: Move mcheck block after includes List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass 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 and includes needed for mcheck. Co-developed-by: Claude Signed-off-by: Simon Glass --- common/dlmalloc.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) 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 #include #include +#include #include #include +#include #include 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() */