From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 15 Jul 2022 05:13:00 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v5.18.12~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=678de9af3ed68dc86848623506642186fe595e34;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	x86-speculation-use-declare_per_cpu-for-x86_spec_ctrl_current.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 6389dd70ed2..99530dbb46d 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -133,3 +133,4 @@ x86-kvm-use-proper-asm-macros-for-kvm_vcpu_is_preempted.patch
 x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch
 x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch
 x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
+x86-speculation-use-declare_per_cpu-for-x86_spec_ctrl_current.patch
diff --git a/queue-5.10/x86-speculation-use-declare_per_cpu-for-x86_spec_ctrl_current.patch b/queue-5.10/x86-speculation-use-declare_per_cpu-for-x86_spec_ctrl_current.patch
new file mode 100644
index 00000000000..e31bb4c9fc7
--- /dev/null
+++ b/queue-5.10/x86-speculation-use-declare_per_cpu-for-x86_spec_ctrl_current.patch
@@ -0,0 +1,51 @@
+From db886979683a8360ced9b24ab1125ad0c4d2cf76 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Wed, 13 Jul 2022 08:24:37 -0700
+Subject: x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit db886979683a8360ced9b24ab1125ad0c4d2cf76 upstream.
+
+Clang warns:
+
+  arch/x86/kernel/cpu/bugs.c:58:21: error: section attribute is specified on redeclared variable [-Werror,-Wsection]
+  DEFINE_PER_CPU(u64, x86_spec_ctrl_current);
+                      ^
+  arch/x86/include/asm/nospec-branch.h:283:12: note: previous declaration is here
+  extern u64 x86_spec_ctrl_current;
+             ^
+  1 error generated.
+
+The declaration should be using DECLARE_PER_CPU instead so all
+attributes stay in sync.
+
+Cc: stable@vger.kernel.org
+Fixes: fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")
+Reported-by: kernel test robot <lkp@intel.com>
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/nospec-branch.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/include/asm/nospec-branch.h
++++ b/arch/x86/include/asm/nospec-branch.h
+@@ -11,6 +11,7 @@
+ #include <asm/cpufeatures.h>
+ #include <asm/msr-index.h>
+ #include <asm/unwind_hints.h>
++#include <asm/percpu.h>
+ 
+ #define RETPOLINE_THUNK_SIZE	32
+ 
+@@ -281,7 +282,7 @@ static inline void indirect_branch_predi
+ 
+ /* The Intel SPEC CTRL MSR base value cache */
+ extern u64 x86_spec_ctrl_base;
+-extern u64 x86_spec_ctrl_current;
++DECLARE_PER_CPU(u64, x86_spec_ctrl_current);
+ extern void write_spec_ctrl_current(u64 val, bool force);
+ extern u64 spec_ctrl_current(void);
+