Changeset 75186 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 30, 2018 4:43:05 PM (6 years ago)

Author:

vboxsync

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

126269

Message:

SUPDrv/darwin: Fixed import search order to match ring-3 and allow VMMR0 to overload stuff. bugref:9232

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -1234 +1234 @@
 
     /*
-     * Consult the SUPDrv export table first.
+     * First consult the VMMR0 module if there is one fully loaded.
+     * This is necessary as VMMR0 may overload assertion and logger symbols.
+     */
+    if (pDevExt->pvVMMR0)
+        for (PSUPDRVLDRIMAGE pImage = pDevExt->pLdrImages; pImage; pImage = pImage->pNext)
+            if (pImage->pvImage == pDevExt->pvVMMR0)
+            {
+                if (   pImage->uState == SUP_IOCTL_LDR_LOAD
+                    && pImage->hLdrMod != NIL_RTLDRMOD)
+                {
+                    int rc = RTLdrGetSymbolEx(pImage->hLdrMod, pImage->pvImage, (uintptr_t)pImage->pvImage,
+                                              UINT32_MAX, pszSymbol, pValue);
+                    if (RT_SUCCESS(rc))
+                        return VINF_SUCCESS;
+                }
+                break;
+            }
+
+    /*
+     * Then we consult the SUPDrv export table.
      */
     uintptr_t uValue = 0;
@@ -1243 +1262 @@
         return VINF_SUCCESS;
     }
-
-    /*
-     * Check already loaded modules.
-     */
-    for (PSUPDRVLDRIMAGE pImage = pDevExt->pLdrImages; pImage; pImage = pImage->pNext)
-        if (   pImage->uState == SUP_IOCTL_LDR_LOAD
-            && pImage->hLdrMod != NIL_RTLDRMOD)
-        {
-            rc = RTLdrGetSymbolEx(pImage->hLdrMod, pImage->pvImage, (uintptr_t)pImage->pvImage, UINT32_MAX, pszSymbol, pValue);
-            if (RT_SUCCESS(rc))
-                return VINF_SUCCESS;
-        }
 
     /*