From 62a05573822fc253a1ad5037482511347d6abaa5 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Fri, 30 Jul 2010 14:12:12 +0800 Subject: 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 Signed-off-by: Scott McNutt --- arch/nios2/lib/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/nios2') 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; -- cgit v1.2.3