x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
PATCH v2 1/1 x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
The IN and OUT immediate instructions only use an 8-bit immediate. The current VC handler uses the entire 32-bit immediate value. These instructions only set the first bytes.
Tested with a loop back port with "outb %0,$0xe0". Before the port seen by KVM was 0xffffffffffffffe0 instead of 0xe0. After the correct port was seen by KVM and the guests loop back OUT then IN were equal.
--- arch/x86/kernel/sev-es-shared.c | 8 ++++++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/sev-es-shared.c +2 -2
@@ -305,14 +305,14 @@ static enum es_result vc_ioio_exitinfo(struct es_em_ctxt *ctxt, u64 *exitinfo)case 0xe4 :case 0xe5 : *exitinfo |=IOIO_TYPE_IN ; - *exitinfo |= (u64 )insn->immediate.value <<16 ; + *exitinfo |= (u8 )insn->immediate.value <<16 ;break ;/* OUT immediate opcodes */ case 0xe6 :case 0xe7 : *exitinfo |=IOIO_TYPE_OUT ; - *exitinfo |= (u64 )insn->immediate.value <<16 ; + *exitinfo |= (u8 )insn->immediate.value <<16 ;break ;
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: a8f7e08a81708920a928664a865208fdf451c49f Gitweb: https://git.kernel.org/tip/a8f7e08a81708920a928664a865208fdf451c49f Author: Peter Gonda <[email protected]> AuthorDate: Tue, 05 Jan 2021 08:33:11 -08:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Tue, 05 Jan 2021 18:55:00 +01:00
x86/sev-es: Fix SEV-ES OUT/IN immediate opcode vc handling
The IN and OUT instructions with port address as an immediate operand only use an 8-bit immediate (imm8). The current VC handler uses the entire 32-bit immediate value but these instructions only set the first bytes.
Cast the operand to an u8 for that.
[ bp: Massage commit message. ]
--- arch/x86/kernel/sev-es-shared.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/sev-es-shared.c +2 -2
@@ -305,14 +305,14 @@ static enum es_result vc_ioio_exitinfo(struct es_em_ctxt *ctxt, u64 *exitinfo)case 0xe4 :case 0xe5 : *exitinfo |=IOIO_TYPE_IN ; - *exitinfo |= (u64 )insn->immediate.value <<16 ; + *exitinfo |= (u8 )insn->immediate.value <<16 ;break ;/* OUT immediate opcodes */ case 0xe6 :case 0xe7 : *exitinfo |=IOIO_TYPE_OUT ; - *exitinfo |= (u64 )insn->immediate.value <<16 ; + *exitinfo |= (u8 )insn->immediate.value <<16 ;break ;/* IN register opcodes */