ARM: 8616/1: dt: Respect property size when parsing CPUs (ba6dea4f) · Commits · 戴 / test

Whilst MPIDR values themselves are less than 32 bits, it is still perfectly valid for a DT to have #address-cells > 1 in the CPUs node, resulting in the "reg" property having leading zero cell(s). In that situation, the big-endian nature of the data conspires with the current behaviour of only reading the first cell to cause the kernel to think all CPUs have ID 0, and become resoundingly unhappy as a consequence. Take the full property length into account when parsing CPUs so as to be correct under any circumstances. Cc: Russell King <linux@armlinux.org.uk> Signed-off-by:

Robin Murphy <robin.murphy@arm.com> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/kernel/devtree.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -88,6 +88,8 @@ void __init arm_dt_init_cpu_maps(void)
		return;

		for_each_child_of_node(cpus, cpu) {
		const __be32 *cell;
		int prop_bytes;
		u32 hwid;

		if (of_node_cmp(cpu->type, "cpu"))
		@@ -99,7 +101,8 @@ void __init arm_dt_init_cpu_maps(void)
		* properties is considered invalid to build the
		* cpu_logical_map.
		*/
		if (of_property_read_u32(cpu, "reg", &hwid)) {
		cell = of_get_property(cpu, "reg", &prop_bytes);
		if (!cell \|\| prop_bytes < sizeof(*cell)) {
		pr_debug(" * %s missing reg property\n",
		cpu->full_name);
		of_node_put(cpu);
		@@ -107,10 +110,15 @@ void __init arm_dt_init_cpu_maps(void)
		}

		/*
		* 8 MSBs must be set to 0 in the DT since the reg property
		* Bits n:24 must be set to 0 in the DT since the reg property
		* defines the MPIDR[23:0].
		*/
		if (hwid & ~MPIDR_HWID_BITMASK) {
		do {
		hwid = be32_to_cpu(*cell++);
		prop_bytes -= sizeof(*cell);
		} while (!hwid && prop_bytes > 0);

		if (prop_bytes \|\| (hwid & ~MPIDR_HWID_BITMASK)) {
		of_node_put(cpu);
		return;
		}

Admin message