Changeset 74703 in vbox for trunk/src/VBox

Timestamp:

Oct 9, 2018 8:13:35 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 #UDs take priority over VM-exit for XSAVE/XSTOR.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -7992 +7992 @@
      * Raise exceptions.
      */
+    if (!(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXSAVE))
+        return iemRaiseUndefinedOpcode(pVCpu);
     /* When in VMX non-root mode and XSAVE/XRSTOR is not enabled, it results in #UD. */
     if (    IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
@@ -7999 +8001 @@
         return iemRaiseUndefinedOpcode(pVCpu);
     }
-    if (!(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXSAVE))
-        return iemRaiseUndefinedOpcode(pVCpu);
     if (pVCpu->cpum.GstCtx.cr0 & X86_CR0_TS)
         return iemRaiseDeviceNotAvailable(pVCpu);
@@ -8155 +8155 @@
      * Raise exceptions.
      */
+    if (!(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXSAVE))
+        return iemRaiseUndefinedOpcode(pVCpu);
     /* When in VMX non-root mode and XSAVE/XRSTOR is not enabled, it results in #UD. */
     if (    IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
@@ -8162 +8164 @@
         return iemRaiseUndefinedOpcode(pVCpu);
     }
-    if (!(pVCpu->cpum.GstCtx.cr4 & X86_CR4_OSXSAVE))
-        return iemRaiseUndefinedOpcode(pVCpu);
     if (pVCpu->cpum.GstCtx.cr0 & X86_CR0_TS)
         return iemRaiseDeviceNotAvailable(pVCpu);