[U-Boot] [PATCH 2/7] malloc_simple: Fix malloc_ptr calculation

[Simon Glass]

On 13 September 2015 at 09:42, Hans de Goede <hdegoede at redhat.com> wrote:
> From: Philipp Rosenberger <ilu at linutronix.de>
>
> 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 at linutronix.de>
> Reviewed-by: Hans de Goede <hdegoede at redhat.com>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>  common/malloc_simple.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Eek! Nice to find this one.

Reviewed-by: Simon Glass <sjg at chromium.org>

>
> diff --git a/common/malloc_simple.c b/common/malloc_simple.c
> index 134e059..c745863 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);
> --
> 2.4.3
>