diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-10-27 10:49:53 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-10-27 10:49:53 -0400 |
commit | ea38f2f9388111b2e0f202cae81c26629937dead (patch) | |
tree | b6651dd350f764829e88c4d9da414ce0b895e8e4 /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch | |
parent | 793d04075c43db89f8925515999951df32179fe1 (diff) | |
download | kernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.gz kernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.xz kernel-ea38f2f9388111b2e0f202cae81c26629937dead.zip |
Refresh SB patchset to fix bisectability issue
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 7d4a46e15..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 0a5c52b9eb4918fb2bee43bacc3521b574334cff 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 1/9] 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 6b8b9a775b46..b3a5364d31c6 100644 +index ebc85c1eefd6..50e027f388d8 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c -@@ -574,8 +574,9 @@ free_handle: +@@ -540,8 +540,9 @@ static void setup_efi_pci(struct boot_params *params) static int get_secure_boot(void) { @@ -29,7 +29,7 @@ index 6b8b9a775b46..b3a5364d31c6 100644 efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID; efi_status_t status; -@@ -599,6 +600,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 6b8b9a775b46..b3a5364d31c6 100644 } -- -2.5.5 +2.9.3 |