darwin: improve the error message on kernel driver detach failure

Detaching a kernel driver in macOS requires that either the binary has the
com.apple.vm.device-access entitlement or is run with effective UID 0 (root). This
commit adds an effective UID check before attempting to capture a device and prints
a warning that neither is the user root nor does the binary have the correct
entitlement.

Signed-off-by: Nathan Hjelm <hjelmn@google.com>

diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 5d3108839f3d6bdd5a06d2c7522b16eeb222b81b..b6cc3592f13e89cf303ab98d39725ceb4f6c36ac 100644 (file)
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -2454,6 +2454,10 @@ static int darwin_detach_kernel_driver (struct libusb_device_handle *dev_handle,
       }
     } else {
       usbi_info (ctx, "no capture entitlements. may not be able to detach the kernel driver for this device");
       }
     } else {
       usbi_info (ctx, "no capture entitlements. may not be able to detach the kernel driver for this device");

+      if (0 != geteuid()) {
+        usbi_warn (ctx, "USB device capture requires either an entitlement (com.apple.vm.device-access) or root privelege");
+        return LIBUSB_ERROR_ACCESS;
+      }

     }
 
     /* reset device to release existing drivers */
     }
 
     /* reset device to release existing drivers */

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 981f7047b46e75bec58ce9367b7e8b9b252b4d13..f5aaa732606371fdaa4bcd3a5be3644baf545bf8 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11648
+#define LIBUSB_NANO 11649