summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Wolf <dev-NTEO@vplace.de>2016-11-23 10:40:07 +0100
committerRalf Baechle <ralf@linux-mips.org>2017-01-03 16:34:43 +0100
commit3ec754410cb3e931a6c4920b1a150f21a94a2bf4 (patch)
treedca6733e3de64d25ae5a697a7c4a46cf83509811
parent02564fc89d3d92a8d4fa6e11c348000b70e9568d (diff)
downloadlinux-3ec754410cb3e931a6c4920b1a150f21a94a2bf4.tar.bz2
of: Add check to of_scan_flat_dt() before accessing initial_boot_params
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>
-rw-r--r--drivers/of/fdt.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c9b5cac03b36..82967b07f7be 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -738,9 +738,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 == '/')