[GIT PULL] efi/urgent for v5.9-rc6

[Borislav Petkov <bp@suse.de>]

Hi Linus,

please pull a single EFI/urgent fix. I'm simply forwarding Ard's tag, I hope
that's ok.

Thx.

---

The following changes since commit fb1201aececc59990b75ef59fca93ae4aa1e1444:

  Documentation: efi: remove description of efi=old_map (2020-08-20 11:18:36 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/efi-urgent-for-v5.9-rc5

for you to fetch changes up to 46908326c6b801201f1e46f5ed0db6e85bef74ae:

  efi: efibc: check for efivars write capability (2020-09-15 18:22:47 +0300)

----------------------------------------------------------------
Single EFI fix for v5.9-rc:
- ensure that the EFI bootloader control module only probes successfully
  on systems that support the EFI SetVariable runtime service

----------------------------------------------------------------
Ard Biesheuvel (1):
      efi: efibc: check for efivars write capability

 drivers/firmware/efi/efibc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg