summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorArvind Sankar <nivedita@alum.mit.edu>2020-07-17 15:45:26 -0400
committerArd Biesheuvel <ardb@kernel.org>2020-08-20 11:18:36 +0200
commitc8502eb2d43b6b9b1dc382299a4d37031be63876 (patch)
treee3c61984672bb8fa25d4026e228be29cd99ec66c /arch
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
efi/x86: Mark kernel rodata non-executable for mixed mode
When remapping the kernel rodata section RO in the EFI pagetables, the protection flags that were used for the text section are being reused, but the rodata section should not be marked executable. Cc: <stable@vger.kernel.org> Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Link: https://lore.kernel.org/r/20200717194526.3452089-1-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/platform/efi/efi_64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 413583f904a6..6af4da1149ba 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -259,6 +259,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
npages = (__end_rodata - __start_rodata) >> PAGE_SHIFT;
rodata = __pa(__start_rodata);
pfn = rodata >> PAGE_SHIFT;
+
+ pf = _PAGE_NX | _PAGE_ENC;
if (kernel_map_pages_in_pgd(pgd, pfn, rodata, npages, pf)) {
pr_err("Failed to map kernel rodata 1:1\n");
return 1;