diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2017-02-20 13:20:23 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2017-02-20 13:20:23 -0600 |
| commit | a98ed5ce60a3a27dd83f47a33d8993eaaef3685e (patch) | |
| tree | 2390fe67f35cf364436421355cf15e7fab72e294 /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch | |
| parent | 7a011b1bac9aea1fdb059ef767f1445c7062b79d (diff) | |
| download | kernel-a98ed5ce60a3a27dd83f47a33d8993eaaef3685e.tar.gz kernel-a98ed5ce60a3a27dd83f47a33d8993eaaef3685e.tar.xz kernel-a98ed5ce60a3a27dd83f47a33d8993eaaef3685e.zip | |
Linux 4.10 rebase for stabilization
Diffstat (limited to 'efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch')
| -rw-r--r-- | efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch index ba2f3cefa..761a66ff7 100644 --- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch +++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch @@ -1,7 +1,7 @@ -From 9ef94251448aa463c5937ee8e8e27d6fd9529509 Mon Sep 17 00:00:00 2001 +From d687d79620ea20511b2dbf77e74fdcf4d94981f9 Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Tue, 5 Feb 2013 19:25:05 -0500 -Subject: [PATCH 11/20] efi: Disable secure boot if shim is in insecure mode +Subject: [PATCH 12/20] efi: Disable secure boot if shim is in insecure mode A user can manually tell the shim boot loader to disable validation of images it loads. When a user does this, it creates a UEFI variable called @@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index b4de3faa3f29..5cc2ef570390 100644 +index ebc85c1eefd6..50e027f388d8 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c -@@ -830,8 +830,9 @@ out: +@@ -540,8 +540,9 @@ static void setup_efi_pci(struct boot_params *params) static int get_secure_boot(void) { @@ -29,7 +29,7 @@ index b4de3faa3f29..5cc2ef570390 100644 efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID; efi_status_t status; -@@ -855,6 +856,23 @@ static int get_secure_boot(void) +@@ -565,6 +566,23 @@ static int get_secure_boot(void) if (setup == 1) return 0; @@ -54,5 +54,5 @@ index b4de3faa3f29..5cc2ef570390 100644 } -- -2.4.3 +2.9.3 |