diff options
| author | Michal Luczaj <mhal@rbox.co> | 2022-08-22 00:06:47 +0200 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2022-08-24 13:45:40 -0700 |
| commit | 6aa5c47c351b22c21205c87977c84809cd015fcf (patch) | |
| tree | 11c5e97e76ab48521f3331b65853710c49213562 /arch/x86/kvm/emulate.c | |
| parent | b24ede22538b4d984cbe20532bbcb303692e7f52 (diff) | |
| download | lwn-6aa5c47c351b22c21205c87977c84809cd015fcf.tar.gz lwn-6aa5c47c351b22c21205c87977c84809cd015fcf.zip | |
KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility
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: Michal Luczaj <mhal@rbox.co>
Fixes: a5457e7bcf9a ("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: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index f092c54d1a2f..08dbcff4045a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1953,7 +1953,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); |