Changeset 50866 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Mar 25, 2014 3:47:11 PM (11 years ago)

Author:

vboxsync

Message:

VMM/EMAll: Disallow writing to reserved bits while loading CR0.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1447 +1447 @@
     uint64_t oldval;
     uint64_t msrEFER;
+    uint32_t fValid;
     int      rc, rc2;
     NOREF(pVM);
@@ -1538 +1539 @@
             &&  !(val & X86_CR4_PAE))
         {
+            return VERR_EM_INTERPRETER; /** @todo generate #GP(0) */
+        }
+
+        /* From IEM iemCImpl_load_CrX. */
+        /** @todo Check guest CPUID bits for determining corresponding valid bits. */
+        fValid = X86_CR4_VME | X86_CR4_PVI
+               | X86_CR4_TSD | X86_CR4_DE
+               | X86_CR4_PSE | X86_CR4_PAE
+               | X86_CR4_MCE | X86_CR4_PGE
+               | X86_CR4_PCE | X86_CR4_OSFSXR
+               | X86_CR4_OSXMMEEXCPT;
+        //if (xxx)
+        //    fValid |= X86_CR4_VMXE;
+        //if (xxx)
+        //    fValid |= X86_CR4_OSXSAVE;
+        if (val & ~(uint64_t)fValid)
+        {
+            Log(("Trying to set reserved CR4 bits: NewCR4=%#llx InvalidBits=%#llx\n", val, val & ~(uint64_t)fValid));
             return VERR_EM_INTERPRETER; /** @todo generate #GP(0) */
         }