From: Marek Marczykowski-Górecki Date: Mon, 28 Sep 2020 08:43:10 +0000 (+0200) Subject: x86/S3: fix shadow stack resume path X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1593 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4bdbf746ac9152e70f264f87db4472707da805ce;p=xen.git x86/S3: fix shadow stack resume path Fix the resume path to load the shadow stack pointer from saved_ssp (not saved_rsp), to match what suspend path does. Fixes: 633ecc4a7cb2 ("x86/S3: Save and restore Shadow Stack configuration") Backport: 4.14 Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a2c41c4f3f..c6b3fcc93d 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -69,7 +69,7 @@ ENTRY(s3_resume) * so SETSSBSY will successfully load a value useful for us, then * reset MSR_PL0_SSP to its usual value and pop the temporary token. */ - mov saved_rsp(%rip), %rdi + mov saved_ssp(%rip), %rdi cmpq $1, %rdi je .L_shstk_done