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

Commit b0a2679d authored by Russell King's avatar Russell King
Browse files

ARM: initrd: disable initrd if passed address overlaps reserved region 



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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5f2c1b30

arch/arm/mm/init.c

+6 −0
Original line number Original line 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);

	memblock_reserve(__pa(_stext), _end - _stext);

#endif

#endif

#ifdef CONFIG_BLK_DEV_INITRD

#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) {

	if (phys_initrd_size) {

		memblock_reserve(phys_initrd_start, phys_initrd_size);

		memblock_reserve(phys_initrd_start, phys_initrd_size);