Revert retpoline vermagic tag
This commit is contained in:
parent
8193bc4081
commit
51134825ce
|
@ -42,7 +42,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 200
|
||||
%global baserelease 201
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -634,6 +634,7 @@ Patch507: loop-fix-concurrent-lo_open-lo_release.patch
|
|||
|
||||
# 550-600 Meltdown and Spectre Fixes
|
||||
Patch550: prevent-bounds-check-bypass-via-speculative-execution.patch
|
||||
Patch551: revert-module-add-retpoline-tag-to-vermagic.patch
|
||||
|
||||
# 600 - Patches for improved Bay and Cherry Trail device support
|
||||
# Below patches are submitted upstream, awaiting review / merging
|
||||
|
@ -2242,6 +2243,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Jan 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.15-201
|
||||
- Revert retpoline vermagic tag
|
||||
|
||||
* Wed Jan 24 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.15-200
|
||||
- Linux v4.14.15
|
||||
- Fix CVE-2018-1000004 (rhbz 1535315 1535316)
|
||||
|
|
|
@ -0,0 +1,52 @@
|
|||
From 5132ede0fe8092b043dae09a7cc32b8ae7272baa Mon Sep 17 00:00:00 2001
|
||||
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Date: Wed, 24 Jan 2018 15:28:17 +0100
|
||||
Subject: Revert "module: Add retpoline tag to VERMAGIC"
|
||||
|
||||
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
|
||||
commit 5132ede0fe8092b043dae09a7cc32b8ae7272baa upstream.
|
||||
|
||||
This reverts commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12.
|
||||
|
||||
Turns out distros do not want to make retpoline as part of their "ABI",
|
||||
so this patch should not have been merged. Sorry Andi, this was my
|
||||
fault, I suggested it when your original patch was the "correct" way of
|
||||
doing this instead.
|
||||
|
||||
Reported-by: Jiri Kosina <jikos@kernel.org>
|
||||
Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC")
|
||||
Acked-by: Andi Kleen <ak@linux.intel.com>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: David Woodhouse <dwmw@amazon.co.uk>
|
||||
Cc: rusty@rustcorp.com.au
|
||||
Cc: arjan.van.de.ven@intel.com
|
||||
Cc: jeyu@kernel.org
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
|
||||
---
|
||||
include/linux/vermagic.h | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
--- a/include/linux/vermagic.h
|
||||
+++ b/include/linux/vermagic.h
|
||||
@@ -31,17 +31,11 @@
|
||||
#else
|
||||
#define MODULE_RANDSTRUCT_PLUGIN
|
||||
#endif
|
||||
-#ifdef RETPOLINE
|
||||
-#define MODULE_VERMAGIC_RETPOLINE "retpoline "
|
||||
-#else
|
||||
-#define MODULE_VERMAGIC_RETPOLINE ""
|
||||
-#endif
|
||||
|
||||
#define VERMAGIC_STRING \
|
||||
UTS_RELEASE " " \
|
||||
MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
|
||||
MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
|
||||
MODULE_ARCH_VERMAGIC \
|
||||
- MODULE_RANDSTRUCT_PLUGIN \
|
||||
- MODULE_VERMAGIC_RETPOLINE
|
||||
+ MODULE_RANDSTRUCT_PLUGIN
|
||||
|
Loading…
Reference in New Issue