From: Felix Fietkau Date: Wed, 30 Nov 2016 16:00:14 +0000 (+0100) Subject: kernel: Add check to of_scan_flat_dt() before accessing initial_boot_params X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=832fb99da24ffe527e1ebd8363ea0d5a459dd594;p=openwrt%2Fstaging%2Frobimarko.git kernel: Add check to of_scan_flat_dt() before accessing initial_boot_params Fixes a bug that affects rt288x Signed-off-by: Tobias Wolf Signed-off-by: Felix Fietkau --- diff --git a/target/linux/generic/patches-4.4/104-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch b/target/linux/generic/patches-4.4/104-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch new file mode 100644 index 0000000000..e7c125d8ec --- /dev/null +++ b/target/linux/generic/patches-4.4/104-of-Add-check-to-of_scan_flat_dt-before-accessing-ini.patch @@ -0,0 +1,30 @@ +From: Tobias Wolf +Date: Wed, 23 Nov 2016 10:40:07 +0100 +Subject: [PATCH] of: Add check to of_scan_flat_dt() before accessing + initial_boot_params + +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 +--- + +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -632,9 +632,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 == '/')