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

Commit a106b21a authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King
Browse files

ARM: 7380/1: DT: do not add a zero-sized memory property 



Some bootloaders are broken enough to expose an ATAG_MEM with
a null size. Converting such tag to a memory node leads to
an unbootable system.

Skip over zero sized ATAG_MEM to avoid this situation.

Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9c5fd9e8

arch/arm/boot/compressed/atags_to_fdt.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,8 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
		} else if (atag->hdr.tag == ATAG_MEM) {

		} else if (atag->hdr.tag == ATAG_MEM) {

			if (memcount >= sizeof(mem_reg_property)/4)

			if (memcount >= sizeof(mem_reg_property)/4)

				continue;

				continue;

			if (!atag->u.mem.size)

				continue;

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);

		} else if (atag->hdr.tag == ATAG_INITRD2) {

		} else if (atag->hdr.tag == ATAG_INITRD2) {