Skip to content

Commit 06f2ac3

Browse files
tlendackysuryasaimadhu
authored andcommitted
x86/sev: Return an error on a returned non-zero SW_EXITINFO1[31:0]
After returning from a VMGEXIT NAE event, SW_EXITINFO1[31:0] is checked for a value of 1, which indicates an error and that SW_EXITINFO2 contains exception information. However, future versions of the GHCB specification may define new values for SW_EXITINFO1[31:0], so really any non-zero value should be treated as an error. Fixes: 597cfe4 ("x86/boot/compressed/64: Setup a GHCB-based VC Exception handler") Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> # 5.10+ Link: https://lkml.kernel.org/r/efc772af831e9e7f517f0439b13b41f56bad8784.1633063321.git.thomas.lendacky@amd.com
1 parent 5816b3e commit 06f2ac3

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/x86/kernel/sev-shared.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ static enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,
130130
} else {
131131
ret = ES_VMM_ERROR;
132132
}
133+
} else if (ghcb->save.sw_exit_info_1 & 0xffffffff) {
134+
ret = ES_VMM_ERROR;
133135
} else {
134136
ret = ES_OK;
135137
}

0 commit comments

Comments
 (0)