hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/sev: Add missing RIP_REL_REF() invocations during sme_enable()

Browse Source 
[ Upstream commit 72dafb567760320f2de7447cd6e979bf9d4e5d17 ]

The following commit:

  1c811d403afd ("x86/sev: Fix position dependent variable references in startup code")

introduced RIP_REL_REF() to force RIP-relative accesses to global variables,
as needed to prevent crashes during early SEV/SME startup code.

For completeness, RIP_REL_REF() should be used with additional variables during
sme_enable():

  https://lore.kernel.org/all/CAMj1kXHnA0fJu6zh634=fbJswp59kSRAbhW+ubDGj1+NYwZJ-Q@mail.gmail.com/

Access these vars with RIP_REL_REF() to prevent problem reoccurence.

Fixes: 1c811d403afd ("x86/sev: Fix position dependent variable references in startup code")
Signed-off-by: Kevin Loughlin <kevinloughlin@google.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20241122202322.977678-1-kevinloughlin@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kevin Loughlin 2024-11-22 20:23:22 +00:00 committed by Greg Kroah-Hartman
parent cbcd6c852c
commit 2380b9f5aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/mem_encrypt_identity.c
View File

@ -588,7 +588,7 @@ void __head sme_enable(struct boot_params *bp)
out: out:
RIP_REL_REF(sme_me_mask) = me_mask; RIP_REL_REF(sme_me_mask) = me_mask;
physical_mask &= ~me_mask; RIP_REL_REF(physical_mask) &= ~me_mask;
cc_vendor = CC_VENDOR_AMD; RIP_REL_REF(cc_vendor) = CC_VENDOR_AMD;
cc_set_mask(me_mask); cc_set_mask(me_mask);
} }