summaryrefslogtreecommitdiffstats
path: root/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-29 09:54:15 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-29 09:54:15 -0400
commitc33dae81dc559b3ae2feb151fa3fffa44a0ccb90 (patch)
tree5b219a6756851a6ff4300999f409785e48eabf79 /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
parent657f83c3d72b5c11d1891acde78e08772410300f (diff)
downloadkernel-c33dae81dc559b3ae2feb151fa3fffa44a0ccb90.tar.gz
kernel-c33dae81dc559b3ae2feb151fa3fffa44a0ccb90.tar.xz
kernel-c33dae81dc559b3ae2feb151fa3fffa44a0ccb90.zip
Linux v3.17-rc7
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.patch8
1 files changed, 4 insertions, 4 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 80883dbc7..d72b3bc88 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,4 +1,4 @@
-From e377b5c796779bcfbdd776f3e8b984aa54e0e3e3 Mon Sep 17 00:00:00 2001
+From 87f4dde157596400b8b1c98a58b6fd28fa0e8f58 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Tue, 5 Feb 2013 19:25:05 -0500
Subject: [PATCH] efi: Disable secure boot if shim is in insecure mode
@@ -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 baab83bcec44..c32bc46bd699 100644
+index 975d11bfaf5b..94bf7819857a 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
-@@ -806,8 +806,9 @@ out:
+@@ -817,8 +817,9 @@ out:
static int get_secure_boot(void)
{
@@ -29,7 +29,7 @@ index baab83bcec44..c32bc46bd699 100644
efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
efi_status_t status;
-@@ -831,6 +832,23 @@ static int get_secure_boot(void)
+@@ -842,6 +843,23 @@ static int get_secure_boot(void)
if (setup == 1)
return 0;