89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
|
From 783e517bb1fd814658cdb26d1d7b5d8f67b448e4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
|
||
|
|
Date: Tue, 7 Nov 2017 11:33:37 +0300
|
||
|
|
Subject: [PATCH 128/231] mm/sparsemem: Fix ARM64 boot crash when
|
||
|
|
CONFIG_SPARSEMEM_EXTREME=y
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2017-5754
|
||
|
|
|
||
|
|
Since commit:
|
||
|
|
|
||
|
|
83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y")
|
||
|
|
|
||
|
|
we allocate the mem_section array dynamically in sparse_memory_present_with_active_regions(),
|
||
|
|
but some architectures, like arm64, don't call the routine to initialize sparsemem.
|
||
|
|
|
||
|
|
Let's move the initialization into memory_present() it should cover all
|
||
|
|
architectures.
|
||
|
|
|
||
|
|
Reported-and-tested-by: Sudeep Holla <sudeep.holla@arm.com>
|
||
|
|
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||
|
|
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
|
||
|
|
Acked-by: Will Deacon <will.deacon@arm.com>
|
||
|
|
Cc: Andrew Morton <akpm@linux-foundation.org>
|
||
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
||
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Cc: linux-mm@kvack.org
|
||
|
|
Fixes: 83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y")
|
||
|
|
Link: http://lkml.kernel.org/r/20171107083337.89952-1-kirill.shutemov@linux.intel.com
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||
|
|
(cherry picked from commit 629a359bdb0e0652a8227b4ff3125431995fec6e)
|
||
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
||
|
|
(cherry picked from commit fbc3acbf37de68310eb5bbc7f4d1977e7b90100e)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
mm/page_alloc.c | 10 ----------
|
||
|
|
mm/sparse.c | 10 ++++++++++
|
||
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
|
||
|
|
index 66eb23ab658d..1423da8dd16f 100644
|
||
|
|
--- a/mm/page_alloc.c
|
||
|
|
+++ b/mm/page_alloc.c
|
||
|
|
@@ -5707,16 +5707,6 @@ void __init sparse_memory_present_with_active_regions(int nid)
|
||
|
|
unsigned long start_pfn, end_pfn;
|
||
|
|
int i, this_nid;
|
||
|
|
|
||
|
|
-#ifdef CONFIG_SPARSEMEM_EXTREME
|
||
|
|
- if (!mem_section) {
|
||
|
|
- unsigned long size, align;
|
||
|
|
-
|
||
|
|
- size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
|
||
|
|
- align = 1 << (INTERNODE_CACHE_SHIFT);
|
||
|
|
- mem_section = memblock_virt_alloc(size, align);
|
||
|
|
- }
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, &this_nid)
|
||
|
|
memory_present(this_nid, start_pfn, end_pfn);
|
||
|
|
}
|
||
|
|
diff --git a/mm/sparse.c b/mm/sparse.c
|
||
|
|
index 308a0789d1bb..9c48e4fe8ce0 100644
|
||
|
|
--- a/mm/sparse.c
|
||
|
|
+++ b/mm/sparse.c
|
||
|
|
@@ -210,6 +210,16 @@ void __init memory_present(int nid, unsigned long start, unsigned long end)
|
||
|
|
{
|
||
|
|
unsigned long pfn;
|
||
|
|
|
||
|
|
+#ifdef CONFIG_SPARSEMEM_EXTREME
|
||
|
|
+ if (unlikely(!mem_section)) {
|
||
|
|
+ unsigned long size, align;
|
||
|
|
+
|
||
|
|
+ size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
|
||
|
|
+ align = 1 << (INTERNODE_CACHE_SHIFT);
|
||
|
|
+ mem_section = memblock_virt_alloc(size, align);
|
||
|
|
+ }
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
start &= PAGE_SECTION_MASK;
|
||
|
|
mminit_validate_memmodel_limits(&start, &end);
|
||
|
|
for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|