Revert "module: Add retpoline tag to VERMAGIC"
This commit is contained in:
parent
3a81855475
commit
e5ce9cb87e
|
@ -199,6 +199,7 @@ linux (4.14.15-1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
[ Salvatore Bonaccorso ]
|
[ Salvatore Bonaccorso ]
|
||||||
* loop: fix concurrent lo_open/lo_release (CVE-2018-5344)
|
* loop: fix concurrent lo_open/lo_release (CVE-2018-5344)
|
||||||
|
* Revert "module: Add retpoline tag to VERMAGIC"
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* bpf: Avoid ABI change in 4.14.14
|
* bpf: Avoid ABI change in 4.14.14
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -155,3 +155,4 @@ features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-T
|
||||||
|
|
||||||
# ABI maintenance
|
# ABI maintenance
|
||||||
debian/bpf-avoid-abi-change-in-4.14.14.patch
|
debian/bpf-avoid-abi-change-in-4.14.14.patch
|
||||||
|
debian/revert-module-add-retpoline-tag-to-vermagic.patch
|
||||||
|
|
Loading…
Reference in New Issue