* [PATCH master] sandbox: libc_malloc: multiply, not add, args in calloc overflow check
@ 2025-03-03 13:28 Ahmad Fatoum
2025-03-04 8:16 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2025-03-03 13:28 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
libc_malloc is built without access to barebox headers, so instead of
size_mul it's using GCC builtins directly.
The check against BAREBOX_MALLOC_MAX_SIZE should've been done using the
product as indicated by the variable name, but erroneously
__builtin_add_overflow was used instead of __builtin_mul_overflow.
Fixes: 8839004152f7 ("sandbox: libc_malloc: fail allocations exceeding MALLOC_MAX_SIZE")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/sandbox/os/libc_malloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sandbox/os/libc_malloc.c b/arch/sandbox/os/libc_malloc.c
index ac97fc37eee5..dd0f8670ff71 100644
--- a/arch/sandbox/os/libc_malloc.c
+++ b/arch/sandbox/os/libc_malloc.c
@@ -67,7 +67,7 @@ void *barebox_calloc(size_t n, size_t elem_size)
size_t product;
void *mem = NULL;
- if (!__builtin_add_overflow(n, elem_size, &product) &&
+ if (!__builtin_mul_overflow(n, elem_size, &product) &&
product <= BAREBOX_MALLOC_MAX_SIZE)
mem = calloc(n, elem_size);
if (!mem)
--
2.39.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH master] sandbox: libc_malloc: multiply, not add, args in calloc overflow check
2025-03-03 13:28 [PATCH master] sandbox: libc_malloc: multiply, not add, args in calloc overflow check Ahmad Fatoum
@ 2025-03-04 8:16 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2025-03-04 8:16 UTC (permalink / raw)
To: barebox, Ahmad Fatoum
On Mon, 03 Mar 2025 14:28:00 +0100, Ahmad Fatoum wrote:
> libc_malloc is built without access to barebox headers, so instead of
> size_mul it's using GCC builtins directly.
>
> The check against BAREBOX_MALLOC_MAX_SIZE should've been done using the
> product as indicated by the variable name, but erroneously
> __builtin_add_overflow was used instead of __builtin_mul_overflow.
>
> [...]
Applied, thanks!
[1/1] sandbox: libc_malloc: multiply, not add, args in calloc overflow check
https://git.pengutronix.de/cgit/barebox/commit/?id=75296e2aa356 (link may not be stable)
Best regards,
--
Sascha Hauer <s.hauer@pengutronix.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-04 9:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-03 13:28 [PATCH master] sandbox: libc_malloc: multiply, not add, args in calloc overflow check Ahmad Fatoum
2025-03-04 8:16 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox