From mboxrd@z Thu Jan  1 00:00:00 1970
From: Scott McNutt <smcnutt@psyent.com>
Date: Wed, 04 Aug 2010 09:09:51 -0400
Subject: [U-Boot] [PATCH] nios2: fix bootm error on fdt args
In-Reply-To: <1280470332-30183-1-git-send-email-thomas@wytron.com.tw>
References: <1280470332-30183-1-git-send-email-thomas@wytron.com.tw>
Message-ID: <4C59669F.30107@psyent.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Applied to branch 'next' at:

   git://git.denx.de/u-boot-nios.git

Regards,
--Scott

Thomas Chou wrote:
> We should check argv[3] only if there are enough args. Otherwise,
> it might cause invalid memory access fault.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
>  arch/nios2/lib/bootm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
> index defa1fc..6d339e8 100644
> --- a/arch/nios2/lib/bootm.c
> +++ b/arch/nios2/lib/bootm.c
> @@ -42,7 +42,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
>  	if (boot_get_fdt(flag, argc, argv, images, &of_flat_tree, &of_size))
>  		return 1;
>  #endif
> -	if (!of_flat_tree)
> +	if (!of_flat_tree && argc > 3)
>  		of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
>  	if (of_flat_tree)
>  		initrd_end = (ulong)of_flat_tree;