Changeset 46915 in vbox

Timestamp:

Jul 2, 2013 5:21:32 PM (12 years ago)

Author:

vboxsync

Message:

PDMLdrEnumModules: Replaced fRc with a enmCtx so we don't load ring-3 modules into the ring-0 address host space.

Location:

trunk

Files:

• include/VBox/vmm/pdmapi.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMLdr.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmapi.h

@@ -76 +76 @@
 VMMR3_INT_DECL(void)    PDMR3TermUVM(PUVM pUVM);
 
+/** PDM loader context indicator.  */
+typedef enum  PDMLDRCTX
+{
+    /** Invalid zero value. */
+    PDMLDRCTX_INVALID = 0,
+    /** Ring-0 context. */
+    PDMLDRCTX_RING_0,
+    /** Ring-3 context. */
+    PDMLDRCTX_RING_3,
+    /** Raw-mode context. */
+    PDMLDRCTX_RAW_MODE,
+    /** End of valid context values. */
+    PDMLDRCTX_END,
+    /** 32-bit type hack. */
+    PDMLDRCTX_32BIT_HACK = 0x7fffffff
+} PDMLDRCTX;
+
 /**
  * Module enumeration callback function.
@@ -87 +104 @@
  * @param   ImageBase       Address where to executable image is loaded.
  * @param   cbImage         Size of the executable image.
- * @param   fRC             Set if raw-mode context, clear if host context.
+ * @param   enmCtx          The context the module is loaded into.
  * @param   pvArg           User argument.
  */
 typedef DECLCALLBACK(int) FNPDMR3ENUM(PVM pVM, const char *pszFilename, const char *pszName,
-                                      RTUINTPTR ImageBase, size_t cbImage, bool fRC, void *pvArg);
+                                      RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg);
 /** Pointer to a FNPDMR3ENUM() function. */
 typedef FNPDMR3ENUM *PFNPDMR3ENUM;

trunk/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp

@@ -542 +542 @@
  */
 static DECLCALLBACK(int) dbgfR3AsLazyPopulateR0Callback(PVM pVM, const char *pszFilename, const char *pszName,
-                                                        RTUINTPTR ImageBase, size_t cbImage, bool fRC, void *pvArg)
+                                                        RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg)
 {
     NOREF(pVM); NOREF(cbImage);
 
     /* Only ring-0 modules. */
-    if (!fRC)
+    if (enmCtx == PDMLDRCTX_RING_0)
     {
         RTDBGMOD hDbgMod;
@@ -570 +570 @@
  */
 static DECLCALLBACK(int) dbgfR3AsLazyPopulateRCCallback(PVM pVM, const char *pszFilename, const char *pszName,
-                                                        RTUINTPTR ImageBase, size_t cbImage, bool fRC, void *pvArg)
+                                                        RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg)
 {
     NOREF(pVM); NOREF(cbImage);
 
     /* Only raw-mode modules. */
-    if (fRC)
+    if (enmCtx == PDMLDRCTX_RAW_MODE)
     {
         RTDBGMOD hDbgMod;

trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp

@@ -1449 +1449 @@
                          pCur->ImageBase,
                          pCur->eType == PDMMOD_TYPE_RC ? RTLdrSize(pCur->hLdrMod) : 0,
-                         pCur->eType == PDMMOD_TYPE_RC,
+                           pCur->eType == PDMMOD_TYPE_RC ? PDMLDRCTX_RAW_MODE
+                         : pCur->eType == PDMMOD_TYPE_R0 ? PDMLDRCTX_RING_0
+                         : pCur->eType == PDMMOD_TYPE_R3 ? PDMLDRCTX_RING_3
+                         :                                 PDMLDRCTX_INVALID,
                          pvArg);
         if (RT_FAILURE(rc))

trunk/src/VBox/VMM/testcase/tstVMM.cpp

@@ -140 +140 @@
 /** PDMR3LdrEnumModules callback, see FNPDMR3ENUM. */
 static DECLCALLBACK(int)
-tstVMMLdrEnum(PVM pVM, const char *pszFilename, const char *pszName, RTUINTPTR ImageBase, size_t cbImage, bool fGC, void *pvUser)
-{
-    NOREF(pVM); NOREF(pszFilename); NOREF(fGC); NOREF(pvUser); NOREF(cbImage);
+tstVMMLdrEnum(PVM pVM, const char *pszFilename, const char *pszName, RTUINTPTR ImageBase, size_t cbImage,
+              PDMLDRCTX enmCtx, void *pvUser)
+{
+    NOREF(pVM); NOREF(pszFilename); NOREF(enmCtx); NOREF(pvUser); NOREF(cbImage);
     RTPrintf("tstVMM: %RTptr %s\n", ImageBase, pszName);
     return VINF_SUCCESS;