* [U-Boot] [PATCH] nios2: fix bootm error on fdt args
@ 2010-07-30 6:12 Thomas Chou
2010-08-04 13:09 ` Scott McNutt
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Chou @ 2010-07-30 6:12 UTC (permalink / raw)
To: u-boot
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;
--
1.7.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] nios2: fix bootm error on fdt args
2010-07-30 6:12 [U-Boot] [PATCH] nios2: fix bootm error on fdt args Thomas Chou
@ 2010-08-04 13:09 ` Scott McNutt
0 siblings, 0 replies; 2+ messages in thread
From: Scott McNutt @ 2010-08-04 13:09 UTC (permalink / raw)
To: u-boot
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-04 13:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-30 6:12 [U-Boot] [PATCH] nios2: fix bootm error on fdt args Thomas Chou
2010-08-04 13:09 ` Scott McNutt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox