summaryrefslogtreecommitdiffstats
path: root/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-01-05 14:56:17 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2016-01-05 14:56:17 -0500
commit48f65f65ce3da16aafd1a9e03fbce36410163daf (patch)
tree7e3979cdae3a84fb38fa0412c450b366b5ad4759 /efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
parent44ce1614d8ca3f93aab59bd742a0bce163a91eb3 (diff)
downloadkernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.tar.gz
kernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.tar.xz
kernel-48f65f65ce3da16aafd1a9e03fbce36410163daf.zip
Merge 4.3.3 from stabilization branch
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, 6 insertions, 2 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 6fd94c8ee..ba2f3cefa 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,6 +1,7 @@
+From 9ef94251448aa463c5937ee8e8e27d6fd9529509 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
+Subject: [PATCH 11/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
@@ -14,7 +15,7 @@ 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 1ef8ea7f8ed9..d82dc9c1c19e 100644
+index b4de3faa3f29..5cc2ef570390 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -830,8 +830,9 @@ out:
@@ -52,3 +53,6 @@ index 1ef8ea7f8ed9..d82dc9c1c19e 100644
return 1;
}
+--
+2.4.3
+