[RFC PATCH 22/23 V2] memblock: compare current_limit with end variable at memblock_find_in_range_node()
From: Lai Jiangshan <hidden>
Date: 2012-08-02 02:53:10
Also in:
cgroups
Subsystem:
memblock and memory management initialization, memory management, the rest · Maintainers:
Mike Rapoport, Andrew Morton, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2012-08-02 · [RFC PATCH 22/23 V2] memblock: compare current_limit with end variable at memblock_find_in_range_node() · Lai Jiangshan <hidden>
From: Yasuaki Ishimatsu <redacted> memblock_find_in_range_node() does not compare memblock.current_limit with end variable. Thus even if memblock.current_limit is smaller than end variable, the function allocates memory address that is bigger than memblock.current_limit. The patch adds the check to "memblock_find_in_range_node()" Signed-off-by: Yasuaki Ishimatsu <redacted> Signed-off-by: Lai Jiangshan <redacted> --- mm/memblock.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 663b805..ce7fcb6 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c@@ -99,11 +99,12 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, phys_addr_t align, int nid) { phys_addr_t this_start, this_end, cand; + phys_addr_t current_limit = memblock.current_limit; u64 i; /* pump up @end */ - if (end == MEMBLOCK_ALLOC_ACCESSIBLE) - end = memblock.current_limit; + if ((end == MEMBLOCK_ALLOC_ACCESSIBLE) || (end > current_limit)) + end = current_limit; /* avoid allocating the first page */ start = max_t(phys_addr_t, start, PAGE_SIZE);
--
1.7.1