From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 14 Jul 2022 09:36:25 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v5.18.12~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b26b52503f44696b10f3b8afe79cbf4e7a8679cd;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 74fc20bc2a7..6389dd70ed2 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -132,3 +132,4 @@ tools-insn-restore-the-relative-include-paths-for-cross-building.patch
 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
diff --git a/queue-5.10/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch b/queue-5.10/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
new file mode 100644
index 00000000000..2f4b60d55b0
--- /dev/null
+++ b/queue-5.10/x86-asm-32-fix-annotate_unret_safe-use-on-32-bit.patch
@@ -0,0 +1,39 @@
+From 3131ef39fb03bbde237d0b8260445898f3dfda5b Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Wed, 13 Jul 2022 11:50:46 +0200
+Subject: x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 3131ef39fb03bbde237d0b8260445898f3dfda5b upstream.
+
+The build on x86_32 currently fails after commit
+
+  9bb2ec608a20 (objtool: Update Retpoline validation)
+
+with:
+
+  arch/x86/kernel/../../x86/xen/xen-head.S:35: Error: no such instruction: `annotate_unret_safe'
+
+ANNOTATE_UNRET_SAFE is defined in nospec-branch.h. And head_32.S is
+missing this include. Fix this.
+
+Fixes: 9bb2ec608a20 ("objtool: Update Retpoline validation")
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Link: https://lore.kernel.org/r/63e23f80-033f-f64e-7522-2816debbc367@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kernel/head_32.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/kernel/head_32.S
++++ b/arch/x86/kernel/head_32.S
+@@ -23,6 +23,7 @@
+ #include <asm/cpufeatures.h>
+ #include <asm/percpu.h>
+ #include <asm/nops.h>
++#include <asm/nospec-branch.h>
+ #include <asm/bootparam.h>
+ #include <asm/export.h>
+ #include <asm/pgtable_32.h>