Changeset 104503 in vbox

Timestamp:

May 3, 2024 12:33:29 PM (9 months ago)

Author:

vboxsync

Message:

Devices/USB/USBProxyDevice-darwin.cpp: Resolve IOServiceAuthorize() dynamically because it is not exposed in older versions of macOS, bugref:10684

File:

• trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp

@@ -51 +51 @@
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
+#include <iprt/ldr.h>
 #include <iprt/list.h>
 #include <iprt/mem.h>
@@ -66 +67 @@
 /** An experiment... */
 //#define USE_LOW_LATENCY_API 1
-/** Some older SDKs we build with don't know about this. */
-#define OSX_kIOServiceInteractionAllowed 0x00000001
 
 
@@ -75 +74 @@
 /** Forward declaration of the Darwin interface structure. */
 typedef struct USBPROXYIFOSX *PUSBPROXYIFOSX;
+
+
+/** @name IOKitLib declarations and definitions for IOServiceAuthorize() which is not available in all SDKs.
+ * @{  */
+/** IOServiceAuthorize in IOKit. */
+typedef kern_return_t (* PFNIOSERVICEAUTHORIZE)(io_service_t, uint32_t options);
+
+#ifndef kIOServiceInteractionAllowed
+# define kIOServiceInteractionAllowed 0x00000001
+#endif
+/** @} */
 
 
@@ -281 +291 @@
  * Not worth cleaning up.  */
 static mach_port_t  g_MasterPort = MACH_PORT_NULL;
+/** Pointer to the IOServiceAuthorize() method. */
+static PFNIOSERVICEAUTHORIZE g_pfnIOServiceAuthorize = NULL;
 
 
@@ -294 +306 @@
     RT_NOREF(pvUser1);
 
-    int rc;
+    RTLDRMOD hMod = NIL_RTLDRMOD;
+    int rc = RTLdrLoadEx("/System/Library/Frameworks/IOKit.framework/Versions/Current/IOKit", &hMod, RTLDRLOAD_FLAGS_NO_SUFFIX | RTLDRLOAD_FLAGS_NO_UNLOAD,
+                         NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTLdrGetSymbol(hMod, "IOServiceAuthorize", (void **)&g_pfnIOServiceAuthorize);
+        if (RT_FAILURE(rc))
+            LogRel(("USB: Failed to resolve IOServiceAuthorize(), capturing USB devices might not work (%Rrc)\n", rc));
+        RTLdrClose(hMod);
+    }
+
     RT_GCC_NO_WARN_DEPRECATED_BEGIN
     kern_return_t krc = IOMasterPort(MACH_PORT_NULL, &g_MasterPort);  /* Deprecated since 12.0. */
@@ -1222 +1244 @@
      * Ask for authorization (which only works with the com.apple.vm.device-access entitlement).
      */
-    irc = IOServiceAuthorize(USBDevice, OSX_kIOServiceInteractionAllowed);
-    if (irc != kIOReturnSuccess)
-        LogRel(("Failed to get device authorization, capturing the device might now work: irc=%#x\n", irc));
+    if (g_pfnIOServiceAuthorize)
+    {
+        irc = g_pfnIOServiceAuthorize(USBDevice, kIOServiceInteractionAllowed);
+        if (irc != kIOReturnSuccess)
+            LogRel(("USB: Failed to get authorization for device '%s', capturing the device might now work: irc=%#x\n",
+                    pszAddress, irc));
+    }
 
     /*