From: Ingo Molnar <mingo@kernel.org> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, Matt Fleming <matt@codeblueprint.co.uk>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-efi@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>, Peter Zijlstra <a.p.zijlstra@chello.nl>, Andrew Morton <akpm@linux-foundation.org> Subject: [GIT PULL] EFI fixes Date: Tue, 7 Mar 2017 21:21:08 +0100 [thread overview] Message-ID: <20170307202107.GA7091@gmail.com> (raw) Linus, Please pull the latest efi-urgent-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-urgent-for-linus # HEAD: d1eb98143c56f24fef125f5bbed49ae0b52fb7d6 efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y A boot crash fix, and a secure boot related boot messages fix. Thanks, Ingo ------------------> Ard Biesheuvel (2): efi/libstub: Treat missing SecureBoot variable as Secure Boot disabled efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y drivers/firmware/efi/arm-runtime.c | 1 + drivers/firmware/efi/libstub/secureboot.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 349dc3e1e52e..974c5a31a005 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -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; diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 6def402bf569..5da36e56b36a 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -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; }
WARNING: multiple messages have this Message-ID (diff)
From: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>, Peter Zijlstra <a.p.zijlstra-/NLkJaSkS4VmR6Xm/wNWPw@public.gmane.org>, Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Subject: [GIT PULL] EFI fixes Date: Tue, 7 Mar 2017 21:21:08 +0100 [thread overview] Message-ID: <20170307202107.GA7091@gmail.com> (raw) Linus, Please pull the latest efi-urgent-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-urgent-for-linus # HEAD: d1eb98143c56f24fef125f5bbed49ae0b52fb7d6 efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y A boot crash fix, and a secure boot related boot messages fix. Thanks, Ingo ------------------> Ard Biesheuvel (2): efi/libstub: Treat missing SecureBoot variable as Secure Boot disabled efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y drivers/firmware/efi/arm-runtime.c | 1 + drivers/firmware/efi/libstub/secureboot.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 349dc3e1e52e..974c5a31a005 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -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; diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 6def402bf569..5da36e56b36a 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -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; }
next reply other threads:[~2017-03-07 22:59 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-07 20:21 Ingo Molnar [this message] 2017-03-07 20:21 ` [GIT PULL] EFI fixes Ingo Molnar -- strict thread matches above, loose matches on Subject: below -- 2021-06-02 17:44 Ingo Molnar 2021-06-02 19:36 ` pr-tracker-bot 2021-03-21 10:47 Ingo Molnar 2021-03-21 18:45 ` pr-tracker-bot 2020-07-25 10:32 Ingo Molnar 2020-07-25 22:30 ` pr-tracker-bot 2020-06-28 18:26 Ingo Molnar 2020-06-28 18:57 ` Linus Torvalds 2020-06-28 19:26 ` Ard Biesheuvel 2020-06-28 19:34 ` Borislav Petkov 2020-07-08 16:20 ` Peter Zijlstra 2020-07-08 18:00 ` Linus Torvalds 2020-07-09 8:28 ` Peter Zijlstra 2020-07-09 9:30 ` Arnd Bergmann 2020-07-09 10:34 ` Kirill A. Shutemov 2020-07-10 10:09 ` Arnd Bergmann 2020-07-10 11:00 ` Kirill A. Shutemov 2020-07-10 11:17 ` Lukas Wunner 2020-06-28 22:05 ` pr-tracker-bot 2020-04-15 9:03 Ingo Molnar 2020-04-16 0:45 ` pr-tracker-bot 2020-03-02 7:10 Ingo Molnar 2020-03-03 23:35 ` pr-tracker-bot 2020-01-18 17:16 Ingo Molnar 2020-01-18 21:05 ` pr-tracker-bot 2019-12-17 11:09 Ingo Molnar 2019-12-17 19:20 ` pr-tracker-bot 2019-11-01 17:43 Ingo Molnar 2019-11-01 19:10 ` pr-tracker-bot 2019-10-12 13:01 Ingo Molnar 2019-10-12 22:35 ` pr-tracker-bot 2019-06-29 8:23 Ingo Molnar 2019-06-29 11:45 ` pr-tracker-bot 2019-06-02 17:35 Ingo Molnar 2019-06-02 18:15 ` pr-tracker-bot 2018-12-09 21:59 Ingo Molnar 2018-12-09 23:45 ` pr-tracker-bot 2018-11-17 10:51 Ingo Molnar 2018-11-18 20:05 ` pr-tracker-bot 2017-12-06 22:05 Ingo Molnar 2017-10-27 19:10 Ingo Molnar 2017-10-27 19:10 ` Ingo Molnar 2017-06-02 6:46 Ingo Molnar 2017-06-02 6:46 ` Ingo Molnar 2017-02-02 20:54 Ingo Molnar 2017-02-02 20:54 ` Ingo Molnar 2017-01-15 9:53 Ingo Molnar 2017-01-15 9:53 ` Ingo Molnar 2016-11-14 7:50 Ingo Molnar 2016-10-22 10:36 Ingo Molnar 2016-09-13 18:08 Ingo Molnar 2016-08-12 19:17 Ingo Molnar 2016-06-10 12:36 Ingo Molnar 2016-05-06 11:07 Ingo Molnar 2015-10-03 10:11 Ingo Molnar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170307202107.GA7091@gmail.com \ --to=mingo@kernel.org \ --cc=a.p.zijlstra@chello.nl \ --cc=akpm@linux-foundation.org \ --cc=ard.biesheuvel@linaro.org \ --cc=hpa@zytor.com \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matt@codeblueprint.co.uk \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.