5.10-stable patches

added patches:
	x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 57fa6e8ec0805846b1d7e39e8fbddf903934a014..73f7aae844a0a34105a005082f15ff410866837a 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -130,3 +130,4 @@ x86-speculation-disable-rrsba-behavior.patch
 x86-static_call-serialize-__static_call_fixup-properly.patch
 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

diff --git a/queue-5.10/x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch b/queue-5.10/x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch
new file mode 100644 (file)
index 0000000..232320d
--- /dev/null
+++ b/queue-5.10/x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch
@@ -0,0 +1,34 @@
+From foo@baz Thu Jul 14 10:26:50 AM CEST 2022
+Date: Thu, 14 Jul 2022 00:50:16 +0200
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Thu, 14 Jul 2022 00:39:33 +0200
+Subject: x86/xen: Fix initialisation in hypercall_page after rethunk
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+The hypercall_page is special and the RETs there should not be changed
+into rethunk calls (but can have SLS mitigation).  Change the initial
+instructions to ret + int3 padding, as was done in upstream commit
+5b2fc51576ef "x86/ibt,xen: Sprinkle the ENDBR".
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/xen/xen-head.S |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/xen/xen-head.S
++++ b/arch/x86/xen/xen-head.S
+@@ -69,9 +69,9 @@ SYM_CODE_END(asm_cpu_bringup_and_idle)
+ SYM_CODE_START(hypercall_page)
+       .rept (PAGE_SIZE / 32)
+               UNWIND_HINT_FUNC
+-              .skip 31, 0x90
+               ANNOTATE_UNRET_SAFE
+-              RET
++              ret
++              .skip 31, 0xcc
+       .endr
+ 
+ #define HYPERCALL(n) \