Changeset 83085 in vbox for trunk/src/VBox/Runtime/common/dbg

Timestamp:

Feb 15, 2020 9:19:54 PM (5 years ago)

Author:

vboxsync

Message:

IPRT,VMM,DBGPlugInDarwin: Implemented in-memory guest kernel and kext image loading for OS X / Mach-O. Requires LINKEDIT to not be jettisoned to work.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -1390 +1390 @@
 
 
-RTDECL(int) RTDbgModCreateFromMachOImage(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName,
-                                         RTLDRARCH enmArch, uint32_t cbImage, uint32_t cSegs, PCRTDBGSEGMENT paSegs,
+RTDECL(int) RTDbgModCreateFromMachOImage(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName, RTLDRARCH enmArch,
+                                         PRTLDRMOD phLdrModIn, uint32_t cbImage, uint32_t cSegs, PCRTDBGSEGMENT paSegs,
                                          PCRTUUID pUuid, RTDBGCFG hDbgCfg, uint32_t fFlags)
 {
@@ -1410 +1410 @@
         AssertReturn(!cbImage, VERR_INVALID_PARAMETER);
     }
-    AssertReturn(cbImage || cSegs, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pUuid, VERR_INVALID_POINTER);
     AssertReturn(!(fFlags & ~RTDBGMOD_F_VALID_MASK), VERR_INVALID_FLAGS);
+
+    AssertPtrNullReturn(phLdrModIn, VERR_INVALID_POINTER);
+    RTLDRMOD hLdrModIn = phLdrModIn ? *phLdrModIn : NIL_RTLDRMOD;
+    AssertReturn(hLdrModIn == NIL_RTLDRMOD || RTLdrSize(hLdrModIn) != ~(size_t)0, VERR_INVALID_HANDLE);
+
+    AssertReturn(cbImage || cSegs || hLdrModIn != NIL_RTLDRMOD, VERR_INVALID_PARAMETER);
 
     int rc = rtDbgModLazyInit();
@@ -1423 +1428 @@
         rc = RTDbgCfgQueryUInt(hDbgCfg, RTDBGCFGPROP_FLAGS, &fDbgCfg);
         AssertRCReturn(rc, rc);
+    }
+
+    /*
+     * If we got no UUID but the caller passed in a module handle, try
+     * query the UUID from it.
+     */
+    RTUUID UuidFromImage = RTUUID_INITIALIZE_NULL;
+    if ((!pUuid || RTUuidIsNull(pUuid)) && hLdrModIn != NIL_RTLDRMOD)
+    {
+        rc = RTLdrQueryProp(hLdrModIn, RTLDRPROP_UUID, &UuidFromImage, sizeof(UuidFromImage));
+        if (RT_SUCCESS(rc))
+            pUuid = &UuidFromImage;
     }
 
@@ -1451 +1468 @@
                     || cSegs /* for the time being. */
                     || (!cbImage && !cSegs)
-                    || (fFlags & RTDBGMOD_F_NOT_DEFERRED) )
+                    || (fFlags & RTDBGMOD_F_NOT_DEFERRED)
+                    || hLdrModIn != NIL_RTLDRMOD)
+                {
                     rc = rtDbgModFromMachOImageWorker(pDbgMod, enmArch, cbImage, cSegs, paSegs, pUuid, hDbgCfg, fFlags);
+                    if (RT_FAILURE(rc) && hLdrModIn != NIL_RTLDRMOD)
+                    {
+                        /*
+                         * Create module based on exports from hLdrModIn.
+                         */
+                        if (!cbImage)
+                            cbImage = (uint32_t)RTLdrSize(hLdrModIn);
+                        pDbgMod->pImgVt = &g_rtDbgModVtImgLdr;
+
+                        rc = rtDbgModLdrOpenFromHandle(pDbgMod, hLdrModIn);
+                        if (RT_SUCCESS(rc))
+                        {
+                            /* We now own the loader handle, so clear the caller variable. */
+                            if (phLdrModIn)
+                                *phLdrModIn = NIL_RTLDRMOD;
+
+                            /** @todo delayed exports stuff   */
+                            rc = rtDbgModCreateForExports(pDbgMod);
+                        }
+                    }
+                }
                 else
                 {
@@ -1493 +1533 @@
     return rc;
 }
-
-
-
 RT_EXPORT_SYMBOL(RTDbgModCreateFromMachOImage);