diff options
| author |   Maxim Levitsky <mlevitsk@redhat.com> | 2022-10-25 15:47:30 +0300 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2022-10-28 06:10:29 -0400 |
| commit | 055f37f84e304e59c046d1accfd8f08462f52c4c (patch) | |
| tree | c57290148e006a4dad37d1277ed3e1f24dea5c6c | |
| parent | KVM: x86: emulator: introduce emulator_recalc_and_set_mode (diff) | |
| download | linux-dev-055f37f84e304e59c046d1accfd8f08462f52c4c.tar.xz linux-dev-055f37f84e304e59c046d1accfd8f08462f52c4c.zip | |
KVM: x86: emulator: update the emulation mode after rsm
Update the emulation mode after RSM so that RIP will be correctly
written back, because the RSM instruction can switch the CPU mode from
32 bit (or less) to 64 bit.
This fixes a guest crash in case the #SMI is received while the guest
runs a code from an address > 32 bit.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20221025124741.228045-13-mlevitsk@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -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 e5522a23d985..33385ebae100 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2662,7 +2662,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt) * those side effects need to be explicitly handled for both success * and shutdown. */ - return X86EMUL_CONTINUE; + return emulator_recalc_and_set_mode(ctxt); emulate_shutdown: ctxt->ops->triple_fault(ctxt); |