Gitlab has successfully been upgraded to 14.0.10 🎉. Enjoy!

Commit 2301ac89 authored by Henrik Riomar's avatar Henrik Riomar Committed by Leonardo Arena
Browse files

main/xen: add fix for XSA-377

This is	CVE-2021-28690
parent 3e46e902
......@@ -249,6 +249,7 @@ options="!strip"
# - CVE-2021-28693 XSA-372
# - CVE-2021-28692 XSA-373
# - CVE-2021-0089 XSA-375
# - CVE-2021-28690 XSA-377
case "$CARCH" in
......@@ -316,6 +317,8 @@ source="https://downloads.xenproject.org/release/xen/$pkgver/xen-$pkgver.tar.gz
xsa375.patch
xsa377.patch
xenstored.initd
xenstored.confd
xenconsoled.initd
......@@ -562,6 +565,7 @@ f39882cfc1475dca9e9215ec8401fd90021bbfe3a36598bb73d256c29ddaddf47d5bd924842d28a2
28dffe2540e281c152d811489c0beed8689f59241df98f545b966bba326bf5007ed19d49b748f49eda8c80a64eb42b5a5465684aebb3d910edd3a0340ea6454a xsa373-4.15-4.patch
841c0084ba9714609e2d97d6c0d75d6b93b59c7a55034beba66388fb38f649adb1fc8dde0c6f0de8d612cade6ec89ca47866d8114455618f323e2dc34b79e5b4 xsa373-4.15-5.patch
59f706d2ce623d59ba0e3edc3081d14bd466fa2401ac1666fca33568022a159501aa972a2c556d8558c2701294a2f153ee0b7b487167ede49f8652bacf69b32d xsa375.patch
9c104793facd9d595a1cbca21034d700e7e25398cad1440131258a349cd60d6145e5847e9c4bd066a5d63a63aceb8995456126a51b6d3ca872cd90717ebc2dbe xsa377.patch
a8dda349cab62febf2ef506eb26d2ba494a649b1c37206519ae23f02a36f600b19996bb8a148e5f21a240ec53ecfcf971a07686b9ddcdad417563fdf39b2215f xenstored.initd
093f7fbd43faf0a16a226486a0776bade5dc1681d281c5946a3191c32d74f9699c6bf5d0ab8de9d1195a2461165d1660788e92a3156c9b3c7054d7b2d52d7ff0 xenstored.confd
1dd04f4bf1890771aa7eef0b6e46f7139487da0907d28dcdbef9fbe335dcf731ca391cfcb175dd82924f637a308de00a69ae981f67348c34f04489ec5e5dc3b7 xenconsoled.initd
......
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: x86/spec-ctrl: Mitigate TAA after S3 resume
The user chosen setting for MSR_TSX_CTRL needs restoring after S3.
All APs get the correct setting via start_secondary(), but the BSP was missed
out.
This is XSA-377 / CVE-2021-28690.
Fixes: 8c4330818f6 ("x86/spec-ctrl: Mitigate the TSX Asynchronous Abort sidechannel")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index 91a8c4d0bd..31a56f02d0 100644
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -288,6 +288,8 @@ static int enter_state(u32 state)
microcode_update_one();
+ tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */
+
if ( !recheck_cpu_features(0) )
panic("Missing previously available feature(s)\n");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment