summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-19 15:39:14 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-19 15:39:14 -0400
commitdaec5ad199c2becf783a47c65bb032621d3c5766 (patch)
tree65b31ca9f6eddc8a846734cae929a0ecd88c8c89 /Add-option-to-automatically-enforce-module-signature.patch
parentfe33fe10550ec372fe16ae955a179135c28ddd55 (diff)
downloadkernel-daec5ad199c2becf783a47c65bb032621d3c5766.tar.gz
kernel-daec5ad199c2becf783a47c65bb032621d3c5766.tar.xz
kernel-daec5ad199c2becf783a47c65bb032621d3c5766.zip
Linux v3.17-rc5-105-g598a0c7d0932
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index c84e404f1..e41c9f054 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -1,4 +1,4 @@
-From 6b2e6564431ed50d4fd736aeae80a44ed2467c59 Mon Sep 17 00:00:00 2001
+From a31311c93c02cb524a33444130d852422febf65a Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Fri, 9 Aug 2013 18:36:30 -0400
Subject: [PATCH] Add option to automatically enforce module signatures when in
@@ -55,7 +55,7 @@ index 36327438caf0..61542c282e70 100644
def_bool y
prompt "Enable seccomp to safely compute untrusted bytecode"
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index f277184e2ac1..88edd48f03e9 100644
+index dca9842d8f91..baab83bcec44 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -12,6 +12,7 @@
@@ -104,7 +104,7 @@ index f277184e2ac1..88edd48f03e9 100644
/*
* See if we have Graphics Output Protocol
*/
-@@ -1374,6 +1406,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1378,6 +1410,10 @@ struct boot_params *efi_main(struct efi_config *c,
else
setup_boot_services32(efi_early);