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

Timestamp:

Sep 12, 2014 11:34:11 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96058

Message:

VMM/CPUM: Raise #GP(0) while writing to disallowed EFER bits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (2 diffs)
• CPUMAllRegs.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1338 +1338 @@
     if (fExtFeatures & X86_CPUID_AMD_FEATURE_EDX_FFXSR)
         fMask |= MSR_K6_EFER_FFXSR;
+
+    /* #GP(0) If anything outside the allowed bits is set. */
+    if ((uValue | fMask) != fMask)
+    {
+        Log(("CPUM: Settings disallowed EFER bit. uValue=%#RX64 fAllowed=%#RX64 -> #GP(0)\n", uValue, fMask));
+        return VERR_CPUM_RAISE_GP_0;
+    }
 
     /* Check for illegal MSR_K6_EFER_LME transitions: not allowed to change LME if

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

@@ -1428 +1428 @@
                 fMask |= MSR_K6_EFER_FFXSR;
 
+            /* #GP(0) If anything outside the allowed bits is set. */
+            if ((uValue | fMask) != fMask)
+            {
+                Log(("CPUM: Settings disallowed EFER bit. uValue=%#RX64 fAllowed=%#RX64 -> #GP(0)\n", uValue, fMask));
+                return VERR_CPUM_RAISE_GP_0;
+            }
+
             /* Check for illegal MSR_K6_EFER_LME transitions: not allowed to change LME if
                paging is enabled. (AMD Arch. Programmer's Manual Volume 2: Table 14-5) */
@@ -1948 +1955 @@
         {
             *pEax = *pEbx = *pEcx = *pEdx = 0;
-            LogRel(("CPUM: CPUMGetGuestCpuId: failed to get CPUID leaf for iLeaf=%#RX32\n", iLeaf));
         }
         return;