| Message ID | 20200927153657.304553-1-marmarek@invisiblethingslab.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/S3: Fix Shadow Stack resume path | expand |
On 27.09.2020 17:36, Marek Marczykowski-Górecki wrote: > Fix the resume path to load the shadow stack pointer from saved_ssp (not > saved_rsp), to match what suspend path does. > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index a2c41c4f3f26..c6b3fcc93d93 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
Fix the resume path to load the shadow stack pointer from saved_ssp (not saved_rsp), to match what suspend path does. Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Fixes: 633ecc4a7cb2 ("x86/S3: Save and restore Shadow Stack configuration") Backport: 4.14 --- xen/arch/x86/acpi/wakeup_prot.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)