diff options
| author | Richard Hughes <richard@hughsie.com> | 2020-02-14 11:09:55 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2020-02-14 12:25:55 +0000 |
| commit | 2672bfb62b9e206dc5ae2a168a0de98333ddbb0f (patch) | |
| tree | f7308038655a65bdf5505fec0246019a18512db3 | |
| parent | 3bf1467c775ef889f136dd20e97fce61068e0189 (diff) | |
| download | gusb-2672bfb62b9e206dc5ae2a168a0de98333ddbb0f.tar.gz | |
Include the USB bus in the generated platform_id
The existing logic here was unsound; the recursion only checked the string for
length 0 after it had gone up the tree to the parent, and so would never match.
This meant if you had identical devices with the same port hierarchy on
different USB busses they had the *same* physical ID. This really upsets
projects like fwupd which use the physical ID to stay the same on device replug
(which worked fine), but also dedupe devices with the same physical ID, which
is what broke here.
| -rw-r--r-- | gusb/gusb-device.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gusb/gusb-device.c b/gusb/gusb-device.c index 3796156..e8fbf82 100644 --- a/gusb/gusb-device.c +++ b/gusb/gusb-device.c @@ -203,18 +203,12 @@ g_usb_device_init (GUsbDevice *device) } static void -g_usb_device_build_platform_id_cb (GString *str, libusb_device *dev) +g_usb_device_build_parent_port_number (GString *str, libusb_device *dev) { - libusb_device *parent; - parent = libusb_get_parent (dev); + libusb_device *parent = libusb_get_parent (dev); if (parent != NULL) - g_usb_device_build_platform_id_cb (str, parent); - if (str->len == 0) { - g_string_append_printf (str, "%02x:", - libusb_get_bus_number (dev)); - } - g_string_append_printf (str, "%02x:", - libusb_get_port_number (dev)); + g_usb_device_build_parent_port_number (str, parent); + g_string_append_printf (str, "%02x:", libusb_get_port_number (dev)); } static gchar * @@ -224,7 +218,8 @@ g_usb_device_build_platform_id (struct libusb_device *dev) /* build a topology of the device */ platform_id = g_string_new ("usb:"); - g_usb_device_build_platform_id_cb (platform_id, dev); + g_string_append_printf (platform_id, "%02x:", libusb_get_bus_number (dev)); + g_usb_device_build_parent_port_number (platform_id, dev); g_string_truncate (platform_id, platform_id->len - 1); return g_string_free (platform_id, FALSE); } |