From: Thomas Chou <thomas@wytron.com.tw>
Date: Fri, 30 Jul 2010 06:12:12 +0000 (+0800)
Subject: nios2: fix bootm error on fdt args
X-Git-Tag: v2010.09-rc1~6^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=62a05573822fc253a1ad5037482511347d6abaa5;p=oweals%2Fu-boot.git

nios2: fix bootm error on fdt args

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>
Signed-off-by: Scott McNutt <smcnutt@psyent.com>
---

diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index e25a1137f1..40a4d15027 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 * const argv[], bootm_headers_t *ima
 	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;