KVM: x86: handle SMBASE as physical address in RSM

commit f40606b147dd5b4678cedc877a71deb520ca507e upstream.

GET_SMSTATE depends on real mode to ensure that smbase+offset is treated
as a physical address, which has already caused a bug after shuffling
the code.  Enforce physical addressing.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 2392541a96e6d6af872c4fcd3dc2289de9d8c6e5..de964970dd90e788a7644479697fffd48690e56e 100644 (file)
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2272,8 +2272,8 @@ static int emulator_has_longmode(struct x86_emulate_ctxt *ctxt)
 #define GET_SMSTATE(type, smbase, offset)                                \
        ({                                                                \
         type __val;                                                      \
-        int r = ctxt->ops->read_std(ctxt, smbase + offset, &__val,       \
-                                    sizeof(__val), NULL);                \
+        int r = ctxt->ops->read_phys(ctxt, smbase + offset, &__val,      \
+                                     sizeof(__val));                     \
         if (r != X86EMUL_CONTINUE)                                       \
                 return X86EMUL_UNHANDLEABLE;                             \
         __val;                                                           \
@@ -2484,8 +2484,7 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
 
        /*
         * Get back to real mode, to prepare a safe state in which to load
-        * CR0/CR3/CR4/EFER.  Also this will ensure that addresses passed
-        * to read_std/write_std are not virtual.
+        * CR0/CR3/CR4/EFER.
         *
         * CR4.PCIDE must be zero, because it is a 64-bit mode only feature.
         */