Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45779be5 authored by Michal Luczaj's avatar Michal Luczaj Committed by Greg Kroah-Hartman
Browse files

KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility 



commit 6aa5c47c351b22c21205c87977c84809cd015fcf upstream.

The emulator checks the wrong variable while setting the CPU
interruptibility state, the target segment is embedded in the instruction
opcode, not the ModR/M register.  Fix the condition.

Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Fixes: a5457e7b ("KVM: emulate: POP SS triggers a MOV SS shadow too")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/20220821215900.1419215-1-mhal@rbox.co


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3a98fc6

arch/x86/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,7 @@ static int em_pop_sreg(struct x86_emulate_ctxt *ctxt) 
	if (rc != X86EMUL_CONTINUE)

		return rc;



	if (ctxt->modrm_reg == VCPU_SREG_SS)

	if (seg == VCPU_SREG_SS)

		ctxt->interruptibility = KVM_X86_SHADOW_INT_MOV_SS;

	if (ctxt->op_bytes > 2)

		rsp_increment(ctxt, ctxt->op_bytes - 2);