Changeset 90997 in vbox for trunk/src/VBox/VMM/VMMAll/VMAll.cpp

Timestamp:

Aug 30, 2021 2:04:48 PM (3 years ago)

Author:

vboxsync

Message:

VMM,PDM,PGM: Restrict the VMSetError and VMSetRuntimeError APIs to ring-3, these never worked properly in ring-0 or raw-mode. A PAEmode runtime error was the only place any of these were used, but given that the VMSetRuntimeError codepath starts with an assertion, it can't have been used/tested. The PAEmode runtime error shouldn't necessarily be triggered by PGM anyway, but IEM. Removed VMMCALLRING3_VM_SET_ERROR and VMMCALLRING3_VM_SET_RUNTIME_ERROR. bugref:10093

File:

• trunk/src/VBox/VMM/VMMAll/VMAll.cpp (modified) (11 diffs)

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

@@ -33 +33 @@
 
 
+#ifdef IN_RING3
+
 /**
  * Sets the error message.
@@ -73 +75 @@
 VMMDECL(int) VMSetErrorV(PVMCC pVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list args)
 {
-#ifdef IN_RING3
+# ifdef IN_RING3
     /*
      * Switch to EMT.
@@ -83 +85 @@
     va_end(va2);
 
-#else
+# else
     /*
      * We're already on the EMT thread and can safely create a VMERROR chunk.
@@ -89 +91 @@
     vmSetErrorCopy(pVM, rc, RT_SRC_POS_ARGS, pszFormat, args);
     VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_SET_ERROR, 0);
-#endif
+# endif
     return rc;
 }
@@ -111 +113 @@
 {
     NOREF(pVM); NOREF(rc); RT_SRC_POS_NOREF(); NOREF(pszFormat); NOREF(args);
-#if 0 /// @todo implement Ring-0 and GC VMSetError
+# if 0 /// @todo implement Ring-0 and GC VMSetError
     /*
      * Create the untranslated message copy.
@@ -169 +171 @@
         pVM->vm.s.pErrorR3 = MMHyper2HC(pVM, (uintptr_t)pArgs.pErr);
     }
-#endif
-}
-
+# endif
+}
+
+#endif /* IN_RING3 */
+#ifdef IN_RING3
 
 /**
@@ -245 +249 @@
     Assert(RTStrEnd(pszFormat, 512) != NULL);
 
-#ifdef IN_RING3
+# ifdef IN_RING3
     /*
      * Switch to EMT.
@@ -274 +278 @@
     }
 
-#else
+# else
     /*
      * We're already on the EMT and can safely create a VMRUNTIMEERROR chunk.
@@ -282 +286 @@
 
     int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_SET_RUNTIME_ERROR, 0);
-#endif
+# endif
 
     Log(("VMSetRuntimeErrorV: returns %Rrc (pszErrorId=%s)\n", rc, pszErrorId));
@@ -307 +311 @@
 {
     NOREF(pVM); NOREF(fFlags); NOREF(pszErrorId); NOREF(pszFormat); NOREF(va);
-#if 0 /// @todo implement Ring-0 and GC VMSetError
+# if 0 /// @todo implement Ring-0 and GC VMSetError
     /*
      * Create the untranslated message copy.
@@ -356 +360 @@
         pVM->vm.s.pErrorRuntimeR3 = MMHyper2HC(pVM, (uintptr_t)pArgs.pErr);
     }
-#endif
-}
-
+# endif
+}
+
+#endif /* IN_RING3 */
 
 /**