1 files changed, 11 insertions, 10 deletions

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index f526acee2eed..f3284827c432 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2582,15 +2582,13 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
          * CR0/CR3/CR4/EFER.  It's all a bit more complicated if the vCPU
          * supports long mode.
          */
-        cr4 = ctxt->ops->get_cr(ctxt, 4);
         if (emulator_has_longmode(ctxt)) {
                 struct desc_struct cs_desc;
 
                 /* Zero CR4.PCIDE before CR0.PG.  */
-                if (cr4 & X86_CR4_PCIDE) {
+                cr4 = ctxt->ops->get_cr(ctxt, 4);
+                if (cr4 & X86_CR4_PCIDE)
                         ctxt->ops->set_cr(ctxt, 4, cr4 & ~X86_CR4_PCIDE);
-                        cr4 &= ~X86_CR4_PCIDE;
-                }
 
                 /* A 32-bit code segment is required to clear EFER.LMA.  */
                 memset(&cs_desc, 0, sizeof(cs_desc));
@@ -2604,13 +2602,16 @@ static int em_rsm(struct x86_emulate_ctxt *ctxt)
         if (cr0 & X86_CR0_PE)
                 ctxt->ops->set_cr(ctxt, 0, cr0 & ~(X86_CR0_PG | X86_CR0_PE));
 
-        /* Now clear CR4.PAE (which must be done before clearing EFER.LME).  */
-        if (cr4 & X86_CR4_PAE)
-                ctxt->ops->set_cr(ctxt, 4, cr4 & ~X86_CR4_PAE);
+        if (emulator_has_longmode(ctxt)) {
+                /* Clear CR4.PAE before clearing EFER.LME. */
+                cr4 = ctxt->ops->get_cr(ctxt, 4);
+                if (cr4 & X86_CR4_PAE)
+                        ctxt->ops->set_cr(ctxt, 4, cr4 & ~X86_CR4_PAE);
 
-        /* And finally go back to 32-bit mode.  */
-        efer = 0;
-        ctxt->ops->set_msr(ctxt, MSR_EFER, efer);
+                /* And finally go back to 32-bit mode.  */
+                efer = 0;
+                ctxt->ops->set_msr(ctxt, MSR_EFER, efer);
+        }
 
         /*
          * Give pre_leave_smm() a chance to make ISA-specific changes to the