aboutsummaryrefslogtreecommitdiff
path: root/arch/nios2
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2010-07-30 14:12:12 +0800
committerScott McNutt <smcnutt@psyent.com>2010-08-19 22:15:49 -0400
commit62a05573822fc253a1ad5037482511347d6abaa5 (patch)
tree57a615421c5bc65a4496a7de576d0e3b01d9f080 /arch/nios2
parentbd2313078114c4b44c4a5ce149af43bcb7fc8854 (diff)
downloadu-boot-linaro-stable-62a05573822fc253a1ad5037482511347d6abaa5.tar.gz
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>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/lib/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index e25a1137f..40a4d1502 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;