Skip to content

Commit 93c1800

Browse files
dkaplan2bp3tk0v
authored andcommitted
x86/kexec: Fix bug with call depth tracking
The call to cc_platform_has() triggers a fault and system crash if call depth tracking is active because the GS segment has been reset by load_segments() and GS_BASE is now 0 but call depth tracking uses per-CPU variables to operate. Call cc_platform_has() earlier in the function when GS is still valid. [ bp: Massage. ] Fixes: 5d82138 ("x86/retbleed: Add SKL return thunk") Signed-off-by: David Kaplan <david.kaplan@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Cc: <stable@kernel.org> Link: https://lore.kernel.org/r/20240603083036.637-1-bp@kernel.org
1 parent c3f38fa commit 93c1800

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

arch/x86/kernel/machine_kexec_64.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,15 @@ void machine_kexec_cleanup(struct kimage *image)
295295
void machine_kexec(struct kimage *image)
296296
{
297297
unsigned long page_list[PAGES_NR];
298-
void *control_page;
298+
unsigned int host_mem_enc_active;
299299
int save_ftrace_enabled;
300+
void *control_page;
301+
302+
/*
303+
* This must be done before load_segments() since if call depth tracking
304+
* is used then GS must be valid to make any function calls.
305+
*/
306+
host_mem_enc_active = cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT);
300307

301308
#ifdef CONFIG_KEXEC_JUMP
302309
if (image->preserve_context)
@@ -358,7 +365,7 @@ void machine_kexec(struct kimage *image)
358365
(unsigned long)page_list,
359366
image->start,
360367
image->preserve_context,
361-
cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT));
368+
host_mem_enc_active);
362369

363370
#ifdef CONFIG_KEXEC_JUMP
364371
if (image->preserve_context)

0 commit comments

Comments
 (0)