aboutsummaryrefslogtreecommitdiffstats
path: root/main/xen/xsa321-4.11-5.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/xen/xsa321-4.11-5.patch')
-rw-r--r--main/xen/xsa321-4.11-5.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/main/xen/xsa321-4.11-5.patch b/main/xen/xsa321-4.11-5.patch
new file mode 100644
index 00000000000..9d47529bded
--- /dev/null
+++ b/main/xen/xsa321-4.11-5.patch
@@ -0,0 +1,24 @@
+From: <security@xenproject.org>
+Subject: x86/alternative: introduce alternative_2
+
+It's based on alternative_io_2 without inputs or outputs but with an
+added memory clobber.
+
+This is part of XSA-321.
+
+Acked-by: Jan Beulich <jbeulich@suse.com>
+
+--- a/xen/include/asm-x86/alternative.h
++++ b/xen/include/asm-x86/alternative.h
+@@ -113,6 +113,11 @@ extern void alternative_instructions(voi
+ #define alternative(oldinstr, newinstr, feature) \
+ asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory")
+
++#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \
++ asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1, \
++ newinstr2, feature2) \
++ : : : "memory")
++
+ /*
+ * Alternative inline assembly with input.
+ *