From a6a7cfeb75c11f78b02a2527129da1fa3cec38f1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Jan 2019 11:43:38 +0100 Subject: [PATCH] 4.14-stable patches added patches: x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch --- queue-4.14/series | 1 + ...s-of-retpoline-with-config_retpoline.patch | 99 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 queue-4.14/x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch diff --git a/queue-4.14/series b/queue-4.14/series index 5fddcb9f536..a6c874055be 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +1,2 @@ x86-kvm-move-qemu-guest-fpu-switching-out-to-vcpu_run.patch +x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch diff --git a/queue-4.14/x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch b/queue-4.14/x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch new file mode 100644 index 00000000000..eec166d52cf --- /dev/null +++ b/queue-4.14/x86-modpost-replace-last-remnants-of-retpoline-with-config_retpoline.patch @@ -0,0 +1,99 @@ +From e4f358916d528d479c3c12bd2fd03f2d5a576380 Mon Sep 17 00:00:00 2001 +From: WANG Chao +Date: Tue, 11 Dec 2018 00:37:25 +0800 +Subject: x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE + +From: WANG Chao + +commit e4f358916d528d479c3c12bd2fd03f2d5a576380 upstream. + +Commit + + 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") + +replaced the RETPOLINE define with CONFIG_RETPOLINE checks. Remove the +remaining pieces. + + [ bp: Massage commit message. ] + +Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") +Signed-off-by: WANG Chao +Signed-off-by: Borislav Petkov +Reviewed-by: Zhenzhong Duan +Reviewed-by: Masahiro Yamada +Cc: "H. Peter Anvin" +Cc: Andi Kleen +Cc: Andrew Morton +Cc: Andy Lutomirski +Cc: Arnd Bergmann +Cc: Daniel Borkmann +Cc: David Woodhouse +Cc: Geert Uytterhoeven +Cc: Jessica Yu +Cc: Jiri Kosina +Cc: Kees Cook +Cc: Konrad Rzeszutek Wilk +Cc: Luc Van Oostenryck +Cc: Michal Marek +Cc: Miguel Ojeda +Cc: Peter Zijlstra +Cc: Tim Chen +Cc: Vasily Gorbik +Cc: linux-kbuild@vger.kernel.org +Cc: srinivas.eeda@oracle.com +Cc: stable +Cc: x86-ml +Link: https://lkml.kernel.org/r/20181210163725.95977-1-chao.wang@ucloud.cn +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/cpu/bugs.c | 2 +- + include/linux/compiler-gcc.h | 2 +- + include/linux/module.h | 2 +- + scripts/mod/modpost.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -212,7 +212,7 @@ static enum spectre_v2_mitigation spectr + static enum spectre_v2_user_mitigation spectre_v2_user __ro_after_init = + SPECTRE_V2_USER_NONE; + +-#ifdef RETPOLINE ++#ifdef CONFIG_RETPOLINE + static bool spectre_v2_bad_module; + + bool retpoline_module_ok(bool has_retpoline) +--- a/include/linux/compiler-gcc.h ++++ b/include/linux/compiler-gcc.h +@@ -108,7 +108,7 @@ + #define __weak __attribute__((weak)) + #define __alias(symbol) __attribute__((alias(#symbol))) + +-#ifdef RETPOLINE ++#ifdef CONFIG_RETPOLINE + #define __noretpoline __attribute__((indirect_branch("keep"))) + #endif + +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -794,7 +794,7 @@ static inline void module_bug_finalize(c + static inline void module_bug_cleanup(struct module *mod) {} + #endif /* CONFIG_GENERIC_BUG */ + +-#ifdef RETPOLINE ++#ifdef CONFIG_RETPOLINE + extern bool retpoline_module_ok(bool has_retpoline); + #else + static inline bool retpoline_module_ok(bool has_retpoline) +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c +@@ -2168,7 +2168,7 @@ static void add_intree_flag(struct buffe + /* Cannot check for assembler */ + static void add_retpoline(struct buffer *b) + { +- buf_printf(b, "\n#ifdef RETPOLINE\n"); ++ buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n"); + buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); + buf_printf(b, "#endif\n"); + } -- 2.47.2