Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1530259
| From | Ard Biesheuvel <ard.biesheuvel@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] |
| Date | 2016-11-25 15:00 +0100 |
| Message-ID | <sHpcK-1fd-13@gated-at.bofh.it> (permalink) |
| References | (5 earlier) <sHnuh-m5-5@gated-at.bofh.it> <sHnND-wd-9@gated-at.bofh.it> <sHo70-CC-35@gated-at.bofh.it> <sHo71-CC-57@gated-at.bofh.it> <sHoqm-YR-51@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 25 November 2016 at 13:00, David Howells <dhowells@redhat.com> wrote:
> Okay, how about the attached?
>
> Can these variables every be anything other than 1 or 0? E.g. should the
> check on SetupMode be that it isn't 0 rather than it is 1?
>
The firmware will ensure that these variables only ever assume the
documented values.
> David
> ---
> commit 6d4bb08e376045e27706c2740c0fdff0a6ec43f7
> Author: David Howells <dhowells@redhat.com>
> Date: Fri Nov 25 11:52:05 2016 +0000
>
> efi: Handle secure boot from UEFI-2.6
>
> UEFI-2.6 adds a new variable, DeployedMode. If it exists, this must be 1
> if we're to engage lockdown mode.
>
> Reported-by: James Bottomley <James.Bottomley@HansenPartnership.com>
> Signed-off-by: David Howells <dhowells@redhat.com>
>
> diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c
> index ca643eba5a4b..157782d1c552 100644
> --- a/drivers/firmware/efi/libstub/secureboot.c
> +++ b/drivers/firmware/efi/libstub/secureboot.c
> @@ -22,6 +22,9 @@ static const efi_char16_t const efi_SecureBoot_name[] = {
> static const efi_char16_t const efi_SetupMode_name[] = {
> 'S', 'e', 't', 'u', 'p', 'M', 'o', 'd', 'e', 0
> };
> +static const efi_char16_t const efi_DeployedMode_name[] = {
> + 'D', 'e', 'p', 'l', 'o', 'y', 'e', 'd', 'M', 'o', 'd', 'e', 0
> +};
>
> /* SHIM variables */
> static const efi_guid_t shim_guid = EFI_SHIM_LOCK_GUID;
> @@ -62,6 +65,17 @@ int efi_get_secureboot(efi_system_table_t *sys_table_arg)
> if (val == 1)
> return 0;
>
> + /* UEFI-2.6 requires DeployedMode to be 1. */
> + if (sys_table_arg->hdr.revision == EFI_2_60_SYSTEM_TABLE_REVISION) {
>=
> + status = get_efi_var(efi_DeployedMode_name, &efi_variable_guid,
> + NULL, &size, &val);
> + if (status != EFI_SUCCESS)
> + goto out_efi_err;
> +
> + if (val != 1)
> + return 0;
val == 0 is better imo, since that will prevent unexpected values from
being interpreted as 'secure boot disabled'
> + }
> +
> /* See if a user has put shim into insecure mode. If so, and if the
> * variable doesn't have the runtime attribute set, we might as well
> * honor that.
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 333d31bf55bf..563abb37f03f 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -645,6 +645,10 @@ typedef struct {
>
> #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
>
> +#define EFI_2_60_SYSTEM_TABLE_REVISION ((2 << 16) | (60))
> +#define EFI_2_50_SYSTEM_TABLE_REVISION ((2 << 16) | (50))
> +#define EFI_2_40_SYSTEM_TABLE_REVISION ((2 << 16) | (40))
> +#define EFI_2_31_SYSTEM_TABLE_REVISION ((2 << 16) | (31))
> #define EFI_2_30_SYSTEM_TABLE_REVISION ((2 << 16) | (30))
> #define EFI_2_20_SYSTEM_TABLE_REVISION ((2 << 16) | (20))
> #define EFI_2_10_SYSTEM_TABLE_REVISION ((2 << 16) | (10))
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] efi: Pass secure boot mode to kernel [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 2/7] x86/efi: Allow invocation of arbitrary runtime services [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 4/7] efi: Add SHIM and image security database GUID definitions [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 7/7] efi: Add EFI_SECURE_BOOT bit [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 1/7] efi: use typed function pointers for runtime services table [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 6/7] efi: Disable secure boot if shim is in insecure mode [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
[PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] James Bottomley <James.Bottomley@HansenPartnership.com> - 2016-11-24 20:50 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 10:50 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 11:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 13:10 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 13:30 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 13:50 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 13:50 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 14:10 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 14:30 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 14:10 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 15:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 17:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 18:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] David Howells <dhowells@redhat.com> - 2016-11-25 18:00 +0100
Re: [PATCH 5/7] efi: Get the secure boot status [ver #3] Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2016-11-25 18:00 +0100
[PATCH 3/7] arm/efi: Allow invocation of arbitrary runtime services [ver #3] David Howells <dhowells@redhat.com> - 2016-11-23 14:00 +0100
csiph-web