of: Add check to of_scan_flat_dt() before accessing initial_boot_params
authorTobias Wolf <dev-NTEO@vplace.de>
Wed, 23 Nov 2016 09:40:07 +0000 (10:40 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Jun 2017 10:48:52 +0000 (12:48 +0200)
commit 3ec754410cb3e931a6c4920b1a150f21a94a2bf4 upstream.

An empty __dtb_start to __dtb_end section might result in
initial_boot_params being null for arch/mips/ralink. This showed that the
boot process hangs indefinitely in of_scan_flat_dt().

Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14605/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/of/fdt.c

index 655f79d..58048dd 100644 (file)
@@ -632,9 +632,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
        const char *pathp;
        int offset, rc = 0, depth = -1;
 
-        for (offset = fdt_next_node(blob, -1, &depth);
-             offset >= 0 && depth >= 0 && !rc;
-             offset = fdt_next_node(blob, offset, &depth)) {
+       if (!blob)
+               return 0;
+
+       for (offset = fdt_next_node(blob, -1, &depth);
+            offset >= 0 && depth >= 0 && !rc;
+            offset = fdt_next_node(blob, offset, &depth)) {
 
                pathp = fdt_get_name(blob, offset, NULL);
                if (*pathp == '/')