summaryrefslogtreecommitdiffstats
path: root/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch')
-rw-r--r--freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch b/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
index 17f877a5c..ff4fc0512 100644
--- a/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
+++ b/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
@@ -33,10 +33,10 @@ index 82fbdbc1e0b0..a811210ad486 100644
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
2D0/A00 ALL e820_map E820 memory map table
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 226d5696e1d1..6a8f880e213f 100644
+index 3dbb7e7909ca..4da6644b1fd0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1697,6 +1697,16 @@ config EFI_MIXED
+@@ -1703,6 +1703,16 @@ config EFI_MIXED
If unsure, say N.
@@ -54,7 +54,7 @@ index 226d5696e1d1..6a8f880e213f 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 48304b89b601..2ff19014117a 100644
+index 2c82bd150d43..1ef8ea7f8ed9 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -12,6 +12,7 @@
@@ -103,7 +103,7 @@ index 48304b89b601..2ff19014117a 100644
/*
* See if we have Graphics Output Protocol
*/
-@@ -1408,6 +1440,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1412,6 +1444,10 @@ struct boot_params *efi_main(struct efi_config *c,
else
setup_boot_services32(efi_early);
@@ -129,10 +129,10 @@ index ab456dc233b5..74ba4083e7ce 100644
* The sentinel is set to a nonzero value (0xff) in header.S.
*
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d74ac33290ae..88dad730e858 100644
+index 80f874bf999e..c2e4f52cad30 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1156,6 +1156,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1160,6 +1160,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();
@@ -146,10 +146,10 @@ index d74ac33290ae..88dad730e858 100644
* Parse the ACPI tables for possible boot-time SMP configuration.
*/
diff --git a/include/linux/module.h b/include/linux/module.h
-index cdc46a791b9d..0c1edd33a42c 100644
+index 57474384b66b..b69d657c3700 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
-@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
+@@ -189,6 +189,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
struct notifier_block;
@@ -163,10 +163,10 @@ index cdc46a791b9d..0c1edd33a42c 100644
extern int modules_disabled; /* for sysctl */
diff --git a/kernel/module.c b/kernel/module.c
-index 17738285d7a2..e7065d683640 100644
+index e9869c497175..87fa14fedc88 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -3916,6 +3916,13 @@ void module_layout(struct module *mod,
+@@ -4084,6 +4084,13 @@ void module_layout(struct module *mod,
EXPORT_SYMBOL(module_layout);
#endif
OpenPOWER on IntegriCloud