summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-21 01:18:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-21 01:18:11 +0300
commit5674d81c21d47e12c2def2df7360ef2dbca108e6 (patch)
treea47f1b37c67a5c329eef71a139ef8174f68620aa /drivers
parent217eee7231e4b70995bfc24d279c61f6fefbf5d6 (diff)
parent46908326c6b801201f1e46f5ed0db6e85bef74ae (diff)
downloadlinux-5674d81c21d47e12c2def2df7360ef2dbca108e6.tar.xz
Merge tag 'efi-urgent-for-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fix from Borislav Petkov: "Ensure that the EFI bootloader control module only probes successfully on systems that support the EFI SetVariable runtime service" [ Tag and commit from Ard Biesheuvel, forwarded by Borislav ] * tag 'efi-urgent-for-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi: efibc: check for efivars write capability
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/efi/efibc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efibc.c b/drivers/firmware/efi/efibc.c
index 35dccc88ac0a..15a47539dc56 100644
--- a/drivers/firmware/efi/efibc.c
+++ b/drivers/firmware/efi/efibc.c
@@ -84,7 +84,7 @@ static int __init efibc_init(void)
{
int ret;
- if (!efi_enabled(EFI_RUNTIME_SERVICES))
+ if (!efivars_kobject() || !efivar_supports_writes())
return -ENODEV;
ret = register_reboot_notifier(&efibc_reboot_notifier);