]> git.sur5r.net Git - u-boot/commitdiff
common: bootm: check return value of strict_strtoul
authorPeng Fan <Peng.Fan@freescale.com>
Tue, 24 Nov 2015 08:54:20 +0000 (16:54 +0800)
committerTom Rini <trini@konsulko.com>
Sat, 5 Dec 2015 23:22:12 +0000 (18:22 -0500)
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>
arch/arm/lib/bootm.c

index ee56d7403e93379b056bb8379c8153d48a79c187..a477cae010db9da5d2f6a04f706e9b16342feaba 100644 (file)
@@ -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);
        }