summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-24 10:02:17 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-24 10:02:17 -0400
commit3fbe156c4a0a525745f7626501fd3375e18a0a38 (patch)
tree6651d983cc0489a4587234bd4973b815770807fc /Add-option-to-automatically-enforce-module-signature.patch
parent92add980cd854302990c88e170f914647d3ea8d4 (diff)
downloadkernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.gz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.tar.xz
kernel-3fbe156c4a0a525745f7626501fd3375e18a0a38.zip
Linux v3.18-rc1-280-g816fb4175c29
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 a335c9c87..7cc669c15 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -54,7 +54,7 @@ index f2327e88e07c..4ba047a782fd 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 de8eebd6f67c..975d11bfaf5b 100644
+index 1acf605a646d..6da2da7ac9c3 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -12,6 +12,7 @@
@@ -65,7 +65,7 @@ index de8eebd6f67c..975d11bfaf5b 100644
#undef memcpy /* Use memcpy from misc.c */
-@@ -814,6 +815,37 @@ out:
+@@ -828,6 +829,37 @@ out:
return status;
}
@@ -103,7 +103,7 @@ index de8eebd6f67c..975d11bfaf5b 100644
/*
* See if we have Graphics Output Protocol
*/
-@@ -1389,6 +1421,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1407,6 +1439,10 @@ struct boot_params *efi_main(struct efi_config *c,
else
setup_boot_services32(efi_early);