From cf559e8e1f58b3d8b266ce7f8a7feb335bf25cfd Mon Sep 17 00:00:00 2001 From: "Sasha Levin (Microsoft)" Date: Sat, 13 Apr 2019 20:32:41 -0400 Subject: [PATCH] patches for 4.9 Signed-off-by: Sasha Levin (Microsoft) --- ...rve-size-of-arm64_memstart_align-in-.patch | 39 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.9/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch diff --git a/queue-4.9/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch b/queue-4.9/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch new file mode 100644 index 0000000000..8b1ac617ce --- /dev/null +++ b/queue-4.9/arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch @@ -0,0 +1,39 @@ +From 082c6695928dcfef44674d8e658832123c9fc906 Mon Sep 17 00:00:00 2001 +From: Yueyi Li +Date: Mon, 24 Dec 2018 07:40:07 +0000 +Subject: arm64: kaslr: Reserve size of ARM64_MEMSTART_ALIGN in linear region + +[ Upstream commit c8a43c18a97845e7f94ed7d181c11f41964976a2 ] + +When KASLR is enabled (CONFIG_RANDOMIZE_BASE=y), the top 4K of kernel +virtual address space may be mapped to physical addresses despite being +reserved for ERR_PTR values. + +Fix the randomization of the linear region so that we avoid mapping the +last page of the virtual address space. + +Cc: Ard Biesheuvel +Signed-off-by: liyueyi +[will: rewrote commit message; merged in suggestion from Ard] +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin (Microsoft) +--- + arch/arm64/mm/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c +index fa6b2fad7a3d..5d3df68272f5 100644 +--- a/arch/arm64/mm/init.c ++++ b/arch/arm64/mm/init.c +@@ -272,7 +272,7 @@ void __init arm64_memblock_init(void) + * memory spans, randomize the linear region as well. + */ + if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) { +- range = range / ARM64_MEMSTART_ALIGN + 1; ++ range /= ARM64_MEMSTART_ALIGN; + memstart_addr -= ARM64_MEMSTART_ALIGN * + ((range * memstart_offset_seed) >> 16); + } +-- +2.19.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 335cc3b660..15df165958 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -45,3 +45,4 @@ powerpc-fsl-update-spectre-v2-reporting.patch powerpc-fsl-fixed-warning-orphan-section-__btb_flush.patch powerpc-fsl-fix-the-flush-of-branch-predictor.patch powerpc-security-fix-spectre_v2-reporting.patch +arm64-kaslr-reserve-size-of-arm64_memstart_align-in-.patch -- 2.39.2