Skip to contentSkip to conversation

Patch "MIPS: init: Ensure reserved memory regions are not added to bootmem" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Nov 19, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: init: Ensure reserved memory regions are not added to bootmem

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-init-ensure-reserved-memory-regions-are-not-added-to-bootmem.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sun Nov 19 12:16:40 CET 2017

From: Marcin Nowakowski <[email protected]>
Date: Wed, 23 Nov 2016 14:43:44 +0100
Subject: MIPS: init: Ensure reserved memory regions are not added to bootmem

From: Marcin Nowakowski <[email protected]>

[ Upstream commit e89ef66d7682f031f026eee6bba03c8c2248d2a9 ]

Memories managed through boot_mem_map are generally expected to define non-crossing areas. However, if part of a larger memory block is marked as reserved, it would still be added to bootmem allocator as an available block and could end up being overwritten by the allocator.

Prevent this by explicitly marking the memory as reserved it if exists in the range used by bootmem allocator.

Patchwork: https://patchwork.linux-mips.org/patch/14608/

---
 arch/mips/kernel/setup.c |    4 ++++
 1 file changed, 4 insertions(+)
arch/mips/kernel/setup.c +4 -0
@@ -427,6 +427,10 @@ static void __init bootmem_init(void)
 			continue;
 		default:
 			/* Not usable memory */
+			if (start > min_low_pfn && end < max_low_pfn)
+				reserve_bootmem(boot_mem_map.map[i].addr,
+						boot_mem_map.map[i].size,
+						BOOTMEM_DEFAULT);
 			continue;
 		}
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/mips-init-ensure-reserved-memory-regions-are-not-added-to-bootmem.patch