From: Philipp Rosenberger <ilu@linutronix.de>
Date: Tue, 8 Sep 2015 10:41:24 +0000 (+0200)
Subject: malloc_simple: fix malloc_ptr calculation
X-Git-Tag: v2015.10-rc4~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=596380db;p=oweals%2Fu-boot.git

malloc_simple: fix malloc_ptr calculation

The gd->malloc_ptr and the gd->malloc_limit are offsets to gd->malloc_base.
But the addr variable contains the absolute address. The new_ptr must be:
addr + bytes - gd->malloc_base.

Signed-off-by: Philipp Rosenberger <ilu@linutronix.de>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 134e059706..c74586376d 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -32,7 +32,7 @@ void *memalign_simple(size_t align, size_t bytes)
 	void *ptr;
 
 	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
-	new_ptr = addr + bytes;
+	new_ptr = addr + bytes - gd->malloc_base;
 	if (new_ptr > gd->malloc_limit)
 		return NULL;
 	ptr = map_sysmem(addr, bytes);