diff options
| author | Philipp Rosenberger <ilu@linutronix.de> | 2015-09-08 12:41:24 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-28 10:15:48 -0400 |
| commit | 596380db285a3f048bb47ca6507ea9de69bc2c7f (patch) | |
| tree | 2358025da8d52d07141394b5689cff26ff0d9965 | |
| parent | d9da26ecc6641d8f257bd32e9108c40805b4cbc3 (diff) | |
| download | talos-obmc-uboot-596380db285a3f048bb47ca6507ea9de69bc2c7f.tar.gz talos-obmc-uboot-596380db285a3f048bb47ca6507ea9de69bc2c7f.zip | |
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>
| -rw-r--r-- | common/malloc_simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |
