Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db89d5c7 authored by Tobias Wolf's avatar Tobias Wolf Committed by Greg Kroah-Hartman
Browse files

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: 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 9c3a8a0f

drivers/of/fdt.c

+6 −3
Original line number Diff line number Diff line
@@ -585,6 +585,9 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, 
	const char *pathp;

	int offset, rc = 0, depth = -1;



	if (!blob)

		return 0;



	for (offset = fdt_next_node(blob, -1, &depth);

	     offset >= 0 && depth >= 0 && !rc;

	     offset = fdt_next_node(blob, offset, &depth)) {