Skip to contentSkip to conversation

nios2: fix bootm error on fdt args

PATCH New Thomas Chou 2 participants 2 messages Jul 30, 2010 – Aug 4, 2010 NIOS2 architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/nios2/lib/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/nios2/lib/bootm.c +1 -1
index defa1fc..6d339e8 100644
@@ -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;
Signature · 1 line
1.7.2
Applied
#1 lore raw

PATCH 1/1 nios2: fix bootm error on fdt args

Applied to branch 'next' at:

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

Regards,
--Scott

Quoted 21 lines · Thomas Chou

We should check argv[3] only if there are enough args. Otherwise, it might cause invalid memory access fault.

---
 arch/nios2/lib/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/nios2/lib/bootm.c +1 -1
index defa1fc..6d339e8 100644
@@ -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;