Changeset 75053 in vbox for trunk/src/VBox/HostDrivers/Support/darwin

Timestamp:

Oct 24, 2018 7:08:56 PM (7 years ago)

Author:

vboxsync

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

126100

Message:

IPRT,SUPDrv: Made the verification code link, fixed a couple of assertions. Seems to work for VMMR0 now. bugref:9232

File:

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

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

@@ -101 +101 @@
 static kern_return_t    VBoxDrvDarwinStart(struct kmod_info *pKModInfo, void *pvData);
 static kern_return_t    VBoxDrvDarwinStop(struct kmod_info *pKModInfo, void *pvData);
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
 static int              supdrvDarwinInitCertStores(PSUPDRVDEVEXT pDevExt);
 static void             supdrvDarwinDestroyCertStores(PSUPDRVDEVEXT pDevExt);
@@ -286 +286 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
             supdrvDarwinInitCertStores(&g_DevExt);
 #endif
@@ -353 +353 @@
                         LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 }
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
                 supdrvDarwinDestroyCertStores(&g_DevExt);
 #endif
@@ -439 +439 @@
 
 
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
 
 /**
@@ -495 +495 @@
 }
 
-#endif /* SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION */
+#endif /* VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION */
 
 /**
@@ -534 +534 @@
     g_Spinlock = NIL_RTSPINLOCK;
 
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
     supdrvDarwinDestroyCertStores(&g_DevExt);
 #endif
@@ -1223 +1223 @@
 
 
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
 
 /**
@@ -1273 +1273 @@
 {
     RT_NOREF(pvUser); //PSUPDRVDEVEXT pDevExt = (PSUPDRVDEVEXT)pvUser;
+# ifdef DEBUG_bird
+    printf("supdrvDarwinLdrOpenVerifyCertificatCallback: pCert=%p hCertPaths=%p\n", pCert, hCertPaths);
+# endif
 
 # if 0
@@ -1361 +1364 @@
 }
 
-#endif /* SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION */
+#endif /* VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION */
 
 int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
 {
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
     /*
      * Initialize our members.
@@ -1450 +1453 @@
     }
     return rc;
-#else  /* !SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION */
+#else  /* !VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION */
     NOREF(pDevExt); NOREF(pImage); NOREF(pszFilename);
     return VERR_NOT_SUPPORTED;
-#endif /* !SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION */
-}
-
-
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#endif /* !VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION */
+}
+
+
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
 /**
  *  @callback_method_impl{FNRTLDRENUMSYMS,
@@ -1476 +1479 @@
                                            const uint8_t *pbImageBits, const char *pszSymbol)
 {
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
     AssertReturn(pImage->hLdrMod != NIL_RTLDRMOD, VERR_INVALID_STATE);
 
@@ -1485 +1488 @@
     if (RT_C_IS_UPPER(*pszSymbol))
     {
-        void *pvFound = NULL;
-        rc = RTLdrGetSymbol(pImage->hLdrMod, pszSymbol, &pvFound);
+        RTLDRADDR uValueFound;
+        rc = RTLdrGetSymbolEx(pImage->hLdrMod, pImage->pvImage, (uintptr_t)pImage->pvImage, UINT32_MAX, pszSymbol, &uValueFound);
         if (RT_SUCCESS(rc))
         {
-            if (pvFound == pv)
+            if (uValueFound == (uintptr_t)pv)
                 rc = VINF_SUCCESS;
             else
             {
-                SUPR0Printf("SUPDrv: Different exports found for %s in %s: %p, expected %p\n",
-                            pszSymbol, pImage->szName, pvFound, pv);
+                SUPR0Printf("SUPDrv: Different exports found for %s in %s: %RTptr, expected %p\n",
+                            pszSymbol, pImage->szName, (RTUINTPTR)uValueFound, pv);
                 rc = VERR_LDR_BAD_FIXUP;
             }
@@ -1529 +1532 @@
 int  VBOXCALL   supdrvOSLdrLoad(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const uint8_t *pbImageBits, PSUPLDRLOAD pReq)
 {
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
     /* State paranoia. */
     AssertReturn(pImage->hLdrMod != NIL_RTLDRMOD, VERR_INVALID_STATE);
@@ -1554 +1557 @@
 void VBOXCALL   supdrvOSLdrUnload(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage)
 {
-#ifdef SUPDRV_WITH_DARWIN_IMAGE_VERIFICATION
+#ifdef VBOX_WITH_DARWIN_R0_DARWIN_IMAGE_VERIFICATION
     if (pImage->hLdrMod != NIL_RTLDRMOD)
     {