summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-11-24 16:54:20 +0800
committerTom Rini <trini@konsulko.com>2015-12-05 18:22:12 -0500
commitbc3c89b1308281edceb67051a44026545dc7b505 (patch)
treeaf39a7b86f37872b7933936b19f4f8f1dfff2bbf /arch
parent9eed48c8bec98425dbd995dd72c40e9ad7a8c26b (diff)
downloadu-boot-imx-bc3c89b1308281edceb67051a44026545dc7b505.zip
u-boot-imx-bc3c89b1308281edceb67051a44026545dc7b505.tar.gz
u-boot-imx-bc3c89b1308281edceb67051a44026545dc7b505.tar.bz2
common: bootm: check return value of strict_strtoul
Before continue, check return value of strict_strtoul. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Simon Glass <sjg@chromium.org> Cc: Jan Kiszka <jan.kiszka@siemens.com> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Hans de Goede <hdegoede@redhat.com> Cc: York Sun <yorksun@freescale.com> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/lib/bootm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index ee56d74..a477cae 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -290,7 +290,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
s = getenv("machid");
if (s) {
- strict_strtoul(s, 16, &machid);
+ if (strict_strtoul(s, 16, &machid) < 0) {
+ debug("strict_strtoul failed!\n");
+ return;
+ }
printf("Using machid 0x%lx from environment\n", machid);
}