aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLey Foon Tan <ley.foon.tan@intel.com>2018-05-18 18:03:12 +0800
committerTom Rini <trini@konsulko.com>2018-05-26 18:19:19 -0400
commitee038c58d5196dc2eb2be7e08e766c50a7bc2619 (patch)
treecfe825939930789b059107f2dfd4821d84045351
parent635159a090fc44c5200c18bf049873476735578d (diff)
downloadu-boot-ee038c58d5196dc2eb2be7e08e766c50a7bc2619.zip
u-boot-ee038c58d5196dc2eb2be7e08e766c50a7bc2619.tar.gz
u-boot-ee038c58d5196dc2eb2be7e08e766c50a7bc2619.tar.bz2
malloc: Use malloc simple before malloc is fully initialized in memalign()
Follow implementation in mALLOc(). Check GD_FLG_FULL_MALLOC_INIT flag and use malloc_simple if GD_FLG_FULL_MALLOC_INIT is unset. Adjust the malloc bytes to align with the requested alignment. The original memalign() function will access mchunkptr struct to adjust the alignment if there is misalignment happen, but mchunkptr struct is not being initialized before full malloc is initialized. This cause the system crash. Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
-rw-r--r--common/dlmalloc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index b395eefb..edaad29 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1891,6 +1891,13 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
if ((long)bytes < 0) return NULL;
+#if CONFIG_VAL(SYS_MALLOC_F_LEN)
+ if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
+ nb = roundup(bytes, alignment);
+ return malloc_simple(nb);
+ }
+#endif
+
/* If need less alignment than we give anyway, just relay to malloc */
if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);