Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21f85778 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fixes from Ingo Molnar:
 "A boot crash fix, and a secure boot related boot messages fix"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y
  efi/libstub: Treat missing SecureBoot variable as Secure Boot disabled
parents c688f14c d1eb9814

drivers/firmware/efi/arm-runtime.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static bool __init efi_virtmap_init(void) 
	bool systab_found;



	efi_mm.pgd = pgd_alloc(&efi_mm);

	mm_init_cpumask(&efi_mm);

	init_new_context(NULL, &efi_mm);



	systab_found = false;

drivers/firmware/efi/libstub/secureboot.c

+2 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) 
	size = sizeof(secboot);

	status = get_efi_var(efi_SecureBoot_name, &efi_variable_guid,

			     NULL, &size, &secboot);

	if (status == EFI_NOT_FOUND)

		return efi_secureboot_mode_disabled;

	if (status != EFI_SUCCESS)

		goto out_efi_err;
@@ -78,7 +80,5 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) 


out_efi_err:

	pr_efi_err(sys_table_arg, "Could not determine UEFI Secure Boot status.\n");

	if (status == EFI_NOT_FOUND)

		return efi_secureboot_mode_disabled;

	return efi_secureboot_mode_unknown;

}