x86/ima: Check EFI_RUNTIME_SERVICES before using
Subsystems (2)
PATCH 1/1 x86/ima: Check EFI_RUNTIME_SERVICES before using
Checking efi_enabled(EFI_BOOT) is not sufficient to ensure that EFI runtime services are available, e.g. if efi=noruntime is used.
Without this, I get an oops on a PREEMPT_RT kernel where efi=noruntime is the default.
Fixes 399574c64eaf94e8 ("x86/ima: retry detecting secure boot mode")
Signed-off-by Scott Wood <[email protected]>
--- arch/x86/kernel/ima_arch.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/ima_arch.c +5 -0
@@ -17,6 +17,11 @@ static enum efi_secureboot_mode get_sb_mode(void) size =sizeof (secboot); +if (!efi_enabled (EFI_RUNTIME_SERVICES )) { +pr_info ("ima: secureboot mode unknown, no efi\n" ); +return efi_secureboot_mode_unknown; + } +/* Get variable contents into buffer */ status = efi.get_variable (efi_SecureBoot_name, &efi_variable_guid,NULL , &size, &secboot);
Signature · 1 line
1.8.3.1
Mimi Zohar
maintainerQuoted 8 lines · Scott Wood
Checking
efi_enabled(EFI_BOOT)is not sufficient to ensure that EFI runtime services are available, e.g. if efi=noruntime is used.Without this, I get an oops on a
PREEMPT_RTkernel where efi=noruntime is the default.Fixes 399574c64eaf94e8 ("x86/ima: retry detecting secure boot mode")Signed-off-by Scott Wood <[email protected]>
Thanks!
Quoted 20 lines
--- arch/x86/kernel/ima_arch.c | 5 +++++ 1 file changed, 5 insertions(+)arch/x86/kernel/ima_arch.c +5
-0@@ -17,6 +17,11 @@ static enum efi_secureboot_mode get_sb_mode(void) size =sizeof (secboot); +if (!efi_enabled (EFI_RUNTIME_SERVICES )) { +pr_info ("ima: secureboot mode unknown, no efi\n" ); +return efi_secureboot_mode_unknown; + } +/* Get variable contents into buffer */ status = efi.get_variable (efi_SecureBoot_name, &efi_variable_guid,NULL , &size, &secboot);