Changeset 70071 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 12, 2017 5:42:25 AM (7 years ago)

Author:

vboxsync

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

119615

Message:

VMM/CPUM: Raise #GP(0) like a physical CPU would when a nested-hypervisor doesn't intercept GIM MSRs.

File:

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

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

@@ -4898 +4898 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrRd_Gim(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
 {
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    /* Raise #GP(0) like a physical CPU would since the nested-hypervisor hasn't intercept these MSRs. */
+    PCCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    if (CPUMIsGuestInNestedHwVirtMode(pCtx))
+        return VERR_CPUM_RAISE_GP_0;
+#endif
     return GIMReadMsr(pVCpu, idMsr, pRange, puValue);
 }
@@ -4905 +4911 @@
 static DECLCALLBACK(VBOXSTRICTRC) cpumMsrWr_Gim(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue)
 {
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    /* Raise #GP(0) like a physical CPU would since the nested-hypervisor hasn't intercept these MSRs. */
+    PCCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    if (CPUMIsGuestInNestedHwVirtMode(pCtx))
+        return VERR_CPUM_RAISE_GP_0;
+#endif
     return GIMWriteMsr(pVCpu, idMsr, pRange, uValue, uRawValue);
 }