Changeset 74254 in vbox for trunk/src/VBox/Runtime/r3/darwin

Timestamp:

Sep 13, 2018 5:22:07 PM (6 years ago)

Author:

vboxsync

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

125048

Message:

IPRT/krnlmod-darwin: Load and resolve IOKit dependency manually as it is not present on older OS x versions. bugref:9152

File:

• trunk/src/VBox/Runtime/r3/darwin/krnlmod-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/darwin/krnlmod-darwin.cpp

@@ -31 +31 @@
 #define LOG_GROUP RTLOGGROUP_SYSTEM
 #include <iprt/krnlmod.h>
+
 #include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <iprt/mem.h>
+#include <iprt/once.h>
 #include <iprt/string.h>
 #include <iprt/types.h>
@@ -41 +44 @@
 #include <IOKit/IOKitLib.h>
 
+
+/** @name Missing/private IOKitLib declarations and definitions.
+ * @{  */
+/** OSKextCopyLoadedKextInfo in IOKit. */
+typedef CFDictionaryRef (* PFNOSKEXTCOPYLOADEDKEXTINFO)(CFArrayRef, CFArrayRef);
+
+#ifndef kOSBundleRetainCountKey
+# define kOSBundleRetainCountKey CFSTR("OSBundleRetainCount")
+#endif
+#ifndef kOSBundleLoadSizeKey
+# define kOSBundleLoadSizeKey CFSTR("OSBundleLoadSize")
+#endif
+#ifndef kOSBundleLoadAddressKey
+# define kOSBundleLoadAddressKey CFSTR("OSBundleLoadAddress")
+#endif
+/** @} */
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 /**
  * Internal kernel information record state.
@@ -56 +80 @@
 typedef const RTKRNLMODINFOINT *PCRTKRNLMODINFOINT;
 
-/**
- * The declarations are not exposed so we have to define them ourselves.
- */
-extern "C"
-{
-    extern CFDictionaryRef OSKextCopyLoadedKextInfo(CFArrayRef, CFArrayRef);
-}
-
-#ifndef kOSBundleRetainCountKey
-# define kOSBundleRetainCountKey CFSTR("OSBundleRetainCount")
-#endif
-
-#ifndef kOSBundleLoadSizeKey
-# define kOSBundleLoadSizeKey CFSTR("OSBundleLoadSize")
-#endif
-
-#ifndef kOSBundleLoadAddressKey
-# define kOSBundleLoadAddressKey CFSTR("OSBundleLoadAddress")
-#endif
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static RTONCE                       g_GetIoKitApisOnce = RTONCE_INITIALIZER;
+static PFNOSKEXTCOPYLOADEDKEXTINFO  g_pfnOSKextCopyLoadedKextInfo = NULL;
+
+/** Do-once callback for setting g_pfnOSKextCopyLoadedKextInfo.   */
+static DECLCALLBACK(int) rtKrnlModDarwinResolveIoKitApis(void *pvUser)
+{
+    RTLDRMOD hMod;
+//    int rc = RTLdrLoad("/System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit", &hMod);
+    int rc = RTLdrLoadEx("/System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit", &hMod, RTLDRLOAD_FLAGS_NO_SUFFIX, NULL);
+    if (RT_SUCCESS(rc))
+        RTLdrGetSymbol(hMod, "OSKextCopyLoadedKextInfo",  (void **)&g_pfnOSKextCopyLoadedKextInfo);
+
+    RT_NOREF(pvUser);
+    return VINF_SUCCESS;
+}
 
 /**
@@ -85 +109 @@
 {
     CFDictionaryRef hDictKext = NULL;
-    CFStringRef hKextName = CFStringCreateWithCString(kCFAllocatorDefault, pszName, kCFStringEncodingUTF8);
-    if (hKextName)
-    {
-        CFArrayRef hArrKextIdRef = CFArrayCreate(kCFAllocatorDefault, (const void **)&hKextName, 1, &kCFTypeArrayCallBacks);
-        if (hArrKextIdRef)
+
+    RTOnce(&g_GetIoKitApisOnce, rtKrnlModDarwinResolveIoKitApis, NULL);
+    if (g_pfnOSKextCopyLoadedKextInfo)
+    {
+        CFStringRef hKextName = CFStringCreateWithCString(kCFAllocatorDefault, pszName, kCFStringEncodingUTF8);
+        if (hKextName)
         {
-            CFDictionaryRef hLoadedKexts = OSKextCopyLoadedKextInfo(hArrKextIdRef, NULL /* all info */);
-            if (hLoadedKexts)
+            CFArrayRef hArrKextIdRef = CFArrayCreate(kCFAllocatorDefault, (const void **)&hKextName, 1, &kCFTypeArrayCallBacks);
+            if (hArrKextIdRef)
             {
-                if (CFDictionaryGetCount(hLoadedKexts) > 0)
+                CFDictionaryRef hLoadedKexts = g_pfnOSKextCopyLoadedKextInfo(hArrKextIdRef, NULL /* all info */);
+                if (hLoadedKexts)
                 {
-                    hDictKext = (CFDictionaryRef)CFDictionaryGetValue(hLoadedKexts, hKextName);
-                    CFRetain(hDictKext);
+                    if (CFDictionaryGetCount(hLoadedKexts) > 0)
+                    {
+                        hDictKext = (CFDictionaryRef)CFDictionaryGetValue(hLoadedKexts, hKextName);
+                        CFRetain(hDictKext);
+                    }
+
+                    CFRelease(hLoadedKexts);
                 }
-
-                CFRelease(hLoadedKexts);
+                CFRelease(hArrKextIdRef);
             }
-            CFRelease(hArrKextIdRef);
+            CFRelease(hKextName);
         }
-        CFRelease(hKextName);
     }
 
@@ -167 +196 @@
 {
     uint32_t cLoadedKexts = 0;
-    CFDictionaryRef hLoadedKexts = OSKextCopyLoadedKextInfo(NULL, NULL /* all info */);
-    if (hLoadedKexts)
-    {
-        cLoadedKexts = CFDictionaryGetCount(hLoadedKexts);
-        CFRelease(hLoadedKexts);
+    RTOnce(&g_GetIoKitApisOnce, rtKrnlModDarwinResolveIoKitApis, NULL);
+    if (g_pfnOSKextCopyLoadedKextInfo)
+    {
+        CFDictionaryRef hLoadedKexts = g_pfnOSKextCopyLoadedKextInfo(NULL, NULL /* all info */);
+        if (hLoadedKexts)
+        {
+            cLoadedKexts = CFDictionaryGetCount(hLoadedKexts);
+            CFRelease(hLoadedKexts);
+        }
     }
 
@@ -184 +217 @@
 
     int rc = VINF_SUCCESS;
-    CFDictionaryRef hLoadedKexts = OSKextCopyLoadedKextInfo(NULL, NULL /* all info */);
-    if (hLoadedKexts)
-    {
-        uint32_t cLoadedKexts = CFDictionaryGetCount(hLoadedKexts);
-        if (cLoadedKexts <= cEntriesMax)
+    RTOnce(&g_GetIoKitApisOnce, rtKrnlModDarwinResolveIoKitApis, NULL);
+    if (g_pfnOSKextCopyLoadedKextInfo)
+    {
+        CFDictionaryRef hLoadedKexts = g_pfnOSKextCopyLoadedKextInfo(NULL, NULL /* all info */);
+        if (hLoadedKexts)
         {
-            CFDictionaryRef *pahDictKext = (CFDictionaryRef *)RTMemTmpAllocZ(cLoadedKexts * sizeof(CFDictionaryRef));
-            if (pahDictKext)
+            uint32_t cLoadedKexts = CFDictionaryGetCount(hLoadedKexts);
+            if (cLoadedKexts <= cEntriesMax)
             {
-                CFDictionaryGetKeysAndValues(hLoadedKexts, NULL, (const void **)pahDictKext);
-                for (uint32_t i = 0; i < cLoadedKexts; i++)
+                CFDictionaryRef *pahDictKext = (CFDictionaryRef *)RTMemTmpAllocZ(cLoadedKexts * sizeof(CFDictionaryRef));
+                if (pahDictKext)
                 {
-                    PRTKRNLMODINFOINT pThis = (PRTKRNLMODINFOINT)RTMemAllocZ(sizeof(RTKRNLMODINFOINT));
-                    if (RT_LIKELY(pThis))
+                    CFDictionaryGetKeysAndValues(hLoadedKexts, NULL, (const void **)pahDictKext);
+                    for (uint32_t i = 0; i < cLoadedKexts; i++)
                     {
-                        pThis->cRefs = 1;
-                        pThis->hDictKext = pahDictKext[i];
-                        CFRetain(pThis->hDictKext);
-                        pahKrnlModInfo[i] = pThis;
-                    }
-                    else
-                    {
-                        rc = VERR_NO_MEMORY;
-                        /* Rollback. */
-                        while (i-- > 0)
+                        PRTKRNLMODINFOINT pThis = (PRTKRNLMODINFOINT)RTMemAllocZ(sizeof(RTKRNLMODINFOINT));
+                        if (RT_LIKELY(pThis))
                         {
-                            CFRelease(pahKrnlModInfo[i]->hDictKext);
-                            RTMemFree(pahKrnlModInfo[i]);
+                            pThis->cRefs = 1;
+                            pThis->hDictKext = pahDictKext[i];
+                            CFRetain(pThis->hDictKext);
+                            pahKrnlModInfo[i] = pThis;
+                        }
+                        else
+                        {
+                            rc = VERR_NO_MEMORY;
+                            /* Rollback. */
+                            while (i-- > 0)
+                            {
+                                CFRelease(pahKrnlModInfo[i]->hDictKext);
+                                RTMemFree(pahKrnlModInfo[i]);
+                            }
                         }
                     }
+
+                    if (   RT_SUCCESS(rc)
+                        && pcEntries)
+                        *pcEntries = cLoadedKexts;
+
+                    RTMemTmpFree(pahDictKext);
                 }
-
-                if (   RT_SUCCESS(rc)
-                    && pcEntries)
-                    *pcEntries = cLoadedKexts;
-
-                RTMemTmpFree(pahDictKext);
+                else
+                    rc = VERR_NO_MEMORY;
             }
             else
-                rc = VERR_NO_MEMORY;
+            {
+                rc = VERR_BUFFER_OVERFLOW;
+
+                if (pcEntries)
+                    *pcEntries = cLoadedKexts;
+            }
+
+            CFRelease(hLoadedKexts);
         }
         else
-        {
-            rc = VERR_BUFFER_OVERFLOW;
-
-            if (pcEntries)
-                *pcEntries = cLoadedKexts;
-        }
-
-        CFRelease(hLoadedKexts);
+            rc = VERR_NOT_SUPPORTED;
     }
     else