From: Greg Kroah-Hartman Date: Fri, 22 Jul 2022 08:59:35 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.57~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60e71949904ee2b0cb075e060c0c4e3aa4174321;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: x86-use-mindirect-branch-cs-prefix-for-retpoline-builds.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index 5288885c8f0..06aac5d57cc 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -141,3 +141,4 @@ tools-arch-x86-sync-the-msr-index.h-copy-with-the-kernel-sources.patch tools-headers-cpufeatures-sync-with-the-kernel-sources.patch x86-bugs-remove-apostrophe-typo.patch um-add-missing-apply_returns.patch +x86-use-mindirect-branch-cs-prefix-for-retpoline-builds.patch diff --git a/queue-5.10/x86-use-mindirect-branch-cs-prefix-for-retpoline-builds.patch b/queue-5.10/x86-use-mindirect-branch-cs-prefix-for-retpoline-builds.patch new file mode 100644 index 00000000000..3dd93012423 --- /dev/null +++ b/queue-5.10/x86-use-mindirect-branch-cs-prefix-for-retpoline-builds.patch @@ -0,0 +1,42 @@ +From 68cf4f2a72ef8786e6b7af6fd9a89f27ac0f520d Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra +Date: Fri, 19 Nov 2021 17:50:25 +0100 +Subject: x86: Use -mindirect-branch-cs-prefix for RETPOLINE builds + +From: Peter Zijlstra + +commit 68cf4f2a72ef8786e6b7af6fd9a89f27ac0f520d upstream. + +In order to further enable commit: + + bbe2df3f6b6d ("x86/alternative: Try inline spectre_v2=retpoline,amd") + +add the new GCC flag -mindirect-branch-cs-prefix: + + https://gcc.gnu.org/g:2196a681d7810ad8b227bf983f38ba716620545e + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102952 + https://bugs.llvm.org/show_bug.cgi?id=52323 + +to RETPOLINE=y builds. This should allow fully inlining retpoline,amd +for GCC builds. + +Signed-off-by: Peter Zijlstra (Intel) +Signed-off-by: Borislav Petkov +Reviewed-by: Kees Cook +Acked-by: Nick Desaulniers +Link: https://lkml.kernel.org/r/20211119165630.276205624@infradead.org +Signed-off-by: Greg Kroah-Hartman +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +--- a/Makefile ++++ b/Makefile +@@ -672,6 +672,7 @@ endif + + ifdef CONFIG_CC_IS_GCC + RETPOLINE_CFLAGS := $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register) ++RETPOLINE_CFLAGS += $(call cc-option,-mindirect-branch-cs-prefix) + RETPOLINE_VDSO_CFLAGS := $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register) + endif + ifdef CONFIG_CC_IS_CLANG