diff options
| author | Tobias Wolf <dev-NTEO@vplace.de> | 2016-11-23 10:40:07 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:48 -0400 |
| commit | a4d31e12d1b6c8102752bea05e756f09de17b6af (patch) | |
| tree | 70572ce7d5053ddc09af12015648e68fdcdd9011 /drivers/of | |
| parent | 84589c8b4819932f41313b7ed4c58881ab466a20 (diff) | |
of: Add check to of_scan_flat_dt() before accessing initial_boot_params
[ Upstream commit 3ec754410cb3e931a6c4920b1a150f21a94a2bf4 ]
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: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 63ea1e5b1c95..bf89754fe973 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -618,9 +618,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 == '/') |