From: Scott McNutt <smcnutt@psyent.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] nios2: fix bootm error on fdt args
Date: Wed, 04 Aug 2010 09:09:51 -0400 [thread overview]
Message-ID: <4C59669F.30107@psyent.com> (raw)
In-Reply-To: <1280470332-30183-1-git-send-email-thomas@wytron.com.tw>
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;
prev parent reply other threads:[~2010-08-04 13:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C59669F.30107@psyent.com \
--to=smcnutt@psyent.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox