ARM: initrd: disable initrd if passed address overlaps reserved region (b0a2679d) · Commits · 戴 / test

Disable the initrd if the passed address already overlaps the reserved region. This avoids oopses on Netwinders when NeTTrom tells the kernel that an initrd is located at mem+4MB, but this overlaps the BSS, resulting in the kernels in-use BSS being freed. This should be applied to v2.6.37-stable. Cc: <stable@kernel.org> Signed-off-by:

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

arch/arm/mm/init.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,12 @@ void __init arm_memblock_init(struct meminfo mi, struct machine_desc mdesc)
		memblock_reserve(__pa(_stext), _end - _stext);
		#endif
		#ifdef CONFIG_BLK_DEV_INITRD
		if (phys_initrd_size &&
		memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {
		pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region - disabling initrd\n",
		phys_initrd_start, phys_initrd_size);
		phys_initrd_start = phys_initrd_size = 0;
		}
		if (phys_initrd_size) {
		memblock_reserve(phys_initrd_start, phys_initrd_size);

Admin message