summaryrefslogtreecommitdiffstats
path: root/Add-option-to-automatically-enforce-module-signature.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-23 11:30:18 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-23 11:30:23 -0500
commitd7293323e7b09ea8bd2f0bbdb43a9b169562bc4d (patch)
treefc7e0f0250044ba9fa8595e4f60eb5cf853c5342 /Add-option-to-automatically-enforce-module-signature.patch
parentea9098159c5db0c8cee08ee41ee147509c904eb3 (diff)
downloadkernel-d7293323e7b09ea8bd2f0bbdb43a9b169562bc4d.tar.gz
kernel-d7293323e7b09ea8bd2f0bbdb43a9b169562bc4d.tar.xz
kernel-d7293323e7b09ea8bd2f0bbdb43a9b169562bc4d.zip
Linux v4.0-rc1
- CVE-2015-0275 ext4: fallocate zero range page size > block size BUG (rhbz 1193907 1195178) - Disable debugging options. Yay for major version bumps :\. We grab the full rc1 tarball instead of just the patch to make this way less messy in the spec. When 4.0 final is released, we'll need to undo a few specific hacks. Namely, we need to redefine: upstream_sublevel kversion Source0 back to the standard definitions. Thanks to Kyle for figuring this out 3 years ago.
Diffstat (limited to 'Add-option-to-automatically-enforce-module-signature.patch')
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 4f251711c..8f9122481 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -20,7 +20,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
7 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
-index 199f453cb4de..ec38acf00b40 100644
+index 82fbdbc1e0b0..a811210ad486 100644
--- a/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
@@ -30,6 +30,8 @@ Offset Proto Name Meaning
@@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 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 eb1cf898ed3c..a2a0a1636287 100644
+index c2fb8a87dccb..0ec6272203e4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1678,6 +1678,16 @@ config EFI_MIXED
+@@ -1694,6 +1694,16 @@ config EFI_MIXED
If unsure, say N.
@@ -115,10 +115,10 @@ index ef17683484e9..105e7360d747 100644
setup_efi_pci(boot_params);
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index 225b0988043a..90dbfb73e11f 100644
+index 44e6dd7e36a2..3ddf4150bd9e 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
-@@ -133,7 +133,8 @@ struct boot_params {
+@@ -134,7 +134,8 @@ struct boot_params {
__u8 eddbuf_entries; /* 0x1e9 */
__u8 edd_mbr_sig_buf_entries; /* 0x1ea */
__u8 kbd_status; /* 0x1eb */
@@ -129,10 +129,10 @@ index 225b0988043a..90dbfb73e11f 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 0a2421cca01f..a3d8174dedf9 100644
+index 98dc9317286e..26741d24797e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1165,6 +1165,12 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();