]> git.sur5r.net Git - u-boot/commitdiff
malloc_simple: Return NULL on malloc failure rather then calling panic()
authorHans de Goede <hdegoede@redhat.com>
Wed, 4 Feb 2015 12:05:50 +0000 (13:05 +0100)
committerSimon Glass <sjg@chromium.org>
Thu, 12 Feb 2015 17:35:29 +0000 (10:35 -0700)
All callers of malloc should already do error checking, and may even be able
to continue without the alloc succeeding.

Moreover, common/malloc_simple.c is the only user of .rodata.str1.1 in
common/built-in.o when building the SPL, triggering this gcc bug:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54303

Causing .rodata to grow with e.g. 0xc21 bytes, nullifying all benefits of
using malloc_simple in the first place.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
common/malloc_simple.c

index afdacff80d8e1fc411cba7eab59286ef28a8a1e5..64ae0365afc52f055621e2c2e6e18e9c095dc9ed 100644 (file)
@@ -19,7 +19,7 @@ void *malloc_simple(size_t bytes)
 
        new_ptr = gd->malloc_ptr + bytes;
        if (new_ptr > gd->malloc_limit)
-               panic("Out of pre-reloc memory");
+               return NULL;
        ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
        return ptr;