Commit dcd015f7 authored by Tobias Wolf's avatar Tobias Wolf Committed by Greg Kroah-Hartman

of: Add check to of_scan_flat_dt() before accessing initial_boot_params

commit 3ec75441 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: default avatarTobias 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: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2060387
...@@ -741,9 +741,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, ...@@ -741,9 +741,12 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node,
const char *pathp; const char *pathp;
int offset, rc = 0, depth = -1; int offset, rc = 0, depth = -1;
for (offset = fdt_next_node(blob, -1, &depth); if (!blob)
offset >= 0 && depth >= 0 && !rc; return 0;
offset = fdt_next_node(blob, offset, &depth)) {
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); pathp = fdt_get_name(blob, offset, NULL);
if (*pathp == '/') if (*pathp == '/')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment