Skip to contentSkip to conversation

Patch "of: Add check to of_scan_flat_dt() before accessing initial_boot_params" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Jun 26, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

of: Add check to of_scan_flat_dt() before accessing initial_boot_params

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
of-add-check-to-of_scan_flat_dt-before-accessing-initial_boot_params.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3ec754410cb3e931a6c4920b1a150f21a94a2bf4 Mon Sep 17 00:00:00 2001

From: Tobias Wolf <[email protected]>
Date: Wed, 23 Nov 2016 10:40:07 +0100
Subject: of: Add check to of_scan_flat_dt() before accessing initial_boot_params

From: Tobias Wolf <[email protected]>

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().

Patchwork: https://patchwork.linux-mips.org/patch/14605/

---
 drivers/of/fdt.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/of/fdt.c +6 -3
@@ -585,9 +585,12 @@ int __init of_scan_flat_dt(int (*it)(uns
 	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 == '/')

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/of-add-check-to-of_scan_flat_dt-before-accessing-initial_boot_params.patch