Patch "x86/pti: Unbreak EFI old_memmap" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/pti: Unbreak EFI old_memmap
to the 4.14-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:
x86-pti-unbreak-efi-old_memmap.patch
and it can be found in the queue-4.14 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
de53c3786a3ce162a1c815d0c04c766c23ec9c0aMon Sep 17 00:00:00 2001
From: Jiri Kosina <[email protected]>
Date: Fri, 5 Jan 2018 22:35:41 +0100
Subject: x86/pti: Unbreak EFI old_memmap
From: Jiri Kosina <[email protected]>
commit de53c3786a3ce162a1c815d0c04c766c23ec9c0a upstream.
EFI_OLD_MEMMAP's efi_call_phys_prolog() calls set_pgd() with swapper PGD that has PAGE_USER set, which makes PTI set NX on it, and therefore EFI can't execute it's code.
Fix that by forcefully clearing _PAGE_NX from the PGD (this can't be done by the pgprot API).
_PAGE_NX will be automatically reintroduced in efi_call_phys_epilog(), as _set_pgd() will again notice that this is _PAGE_USER, and set _PAGE_NX on it.
--- arch/x86/platform/efi/efi_64.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/platform/efi/efi_64.c +2 -0
@@ -134,7 +134,9 @@ pgd_t * __init efi_call_phys_prolog(void pud[j] = *pud_offset (p4d_k, vaddr); } } +pgd_offset_k (pgd *PGDIR_SIZE )->pgd &= ~_PAGE_NX; } + out:__flush_tlb_all ();
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86-pti-unbreak-efi-old_memmap.patch