Commit 55a677b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi 

Pull EFI fix from Ard Biesheuvel:
 "Ensure that the EFI memory map resides in encrypted memory even after
  it has been reallocated"

* tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  x86/sme: Explicitly map new EFI memmap table as encrypted
parents 0fcfb00b 1ff2fc02

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1932,6 +1932,7 @@ config EFI 
	depends on ACPI

	select UCS2_STRING

	select EFI_RUNTIME_WRAPPERS

	select ARCH_USE_MEMREMAP_PROT

	help

	  This enables the kernel to use EFI runtime services that are

	  available (such as the EFI variable services).

arch/x86/platform/efi/quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -277,7 +277,8 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) 
		return;

	}



	new = early_memremap(data.phys_map, data.size);

	new = early_memremap_prot(data.phys_map, data.size,

				  pgprot_val(pgprot_encrypted(FIXMAP_PAGE_NORMAL)));

	if (!new) {

		pr_err("Failed to map new boot services memmap\n");

		return;