aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Wolf <dev-NTEO@vplace.de>2016-11-23 10:40:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-29 12:48:52 +0200
commit7dfea167fc1d4ba886a305802c94fde99516b2e1 (patch)
tree6d1928f98ebfa372725d2df8ccb59857ae69c292
parenteab38dfd66d7f13b9eecfae7728ff0d2e49ff16f (diff)
downloadlinux-linaro-stable-7dfea167fc1d4ba886a305802c94fde99516b2e1.tar.gz
of: Add check to of_scan_flat_dt() before accessing initial_boot_params
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>
-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 655f79db7899..58048dd5fcd0 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -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 == '/')