summaryrefslogtreecommitdiffstats
path: root/efi-Add-EFI_SECURE_BOOT-bit.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 /efi-Add-EFI_SECURE_BOOT-bit.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 'efi-Add-EFI_SECURE_BOOT-bit.patch')
-rw-r--r--efi-Add-EFI_SECURE_BOOT-bit.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch
index df9a0dfcb..f0110ea86 100644
--- a/efi-Add-EFI_SECURE_BOOT-bit.patch
+++ b/efi-Add-EFI_SECURE_BOOT-bit.patch
@@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 3 insertions(+)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index a3d8174dedf9..26c5d54124c1 100644
+index 26741d24797e..64a123acb97f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
-@@ -1153,7 +1153,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1167,7 +1167,9 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
if (boot_params.secure_boot) {