diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-11-22 18:00:06 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-11-23 08:20:32 +0100 |
commit | 183ec6ef9404b556ab205b2e4fd106a17aa689e5 (patch) | |
tree | 78e7417e54b2af36f4b8ca5f0d94f5d1ee39de03 /arch/sandbox | |
parent | c274f8fc54d5fd160005c9199985905a17ea035a (diff) | |
download | barebox-183ec6ef9404b556ab205b2e4fd106a17aa689e5.tar.gz barebox-183ec6ef9404b556ab205b2e4fd106a17aa689e5.tar.xz |
sandbox: libc_malloc: populate barebox errno on error
TLSF already populates errno on errors, so do likewise for the
allocators that don't.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20231122170007.3849506-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox')
-rw-r--r-- | arch/sandbox/os/libc_malloc.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/arch/sandbox/os/libc_malloc.c b/arch/sandbox/os/libc_malloc.c index 74e3e26805..975c41b0ec 100644 --- a/arch/sandbox/os/libc_malloc.c +++ b/arch/sandbox/os/libc_malloc.c @@ -6,18 +6,30 @@ #include <stdlib.h> #include <malloc.h> +#define BAREBOX_ENOMEM 12 +extern int barebox_errno; + void barebox_malloc_stats(void) { } void *barebox_memalign(size_t alignment, size_t bytes) { - return memalign(alignment, bytes); + void *mem = memalign(alignment, bytes); + if (!mem) + barebox_errno = BAREBOX_ENOMEM; + + return mem; } void *barebox_malloc(size_t size) { - return malloc(size); + + void *mem = malloc(size); + if (!mem) + barebox_errno = BAREBOX_ENOMEM; + + return mem; } void barebox_free(void *ptr) @@ -27,10 +39,18 @@ void barebox_free(void *ptr) void *barebox_realloc(void *ptr, size_t size) { - return realloc(ptr, size); + void *mem = realloc(ptr, size); + if (!mem) + barebox_errno = BAREBOX_ENOMEM; + + return mem; } void *barebox_calloc(size_t n, size_t elem_size) { - return calloc(n, elem_size); + void *mem = calloc(n, elem_size); + if (!mem) + barebox_errno = BAREBOX_ENOMEM; + + return mem; } |