From e09a4ef458b7539b33b0e75dcec5277ba134c377 Mon Sep 17 00:00:00 2001
From: Kevin Mehall <km@kevinmehall.net>
Date: Thu, 29 May 2025 22:22:34 -0600
Subject: [PATCH] linux: Canonicalize sysfs paths

For consistency with hotplug events
---
 src/platform/linux_usbfs/enumeration.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/platform/linux_usbfs/enumeration.rs b/src/platform/linux_usbfs/enumeration.rs
index 5d31cb5..c291faf 100644
--- a/src/platform/linux_usbfs/enumeration.rs
+++ b/src/platform/linux_usbfs/enumeration.rs
@@ -137,6 +137,8 @@ pub fn list_devices() -> impl MaybeFuture<Output = Result<impl Iterator<Item = D
                 return None;
             }
 
+            let path = path.canonicalize().ok()?;
+
             probe_device(SysfsPath(path))
                 .inspect_err(|e| warn!("{e}; ignoring device"))
                 .ok()
@@ -154,6 +156,8 @@ pub fn list_root_hubs() -> Result<impl Iterator<Item = DeviceInfo>, Error> {
             return None;
         }
 
+        let path = path.canonicalize().ok()?;
+
         probe_device(SysfsPath(path))
             .inspect_err(|e| warn!("{e}; ignoring root hub"))
             .ok()
@@ -164,14 +168,8 @@ pub fn list_buses() -> impl MaybeFuture<Output = Result<impl Iterator<Item = Bus
     Ready((|| {
         Ok(list_root_hubs()?.filter_map(|rh| {
             // get the parent by following the absolute symlink; root hub in /bus/usb is a symlink to a dir in parent bus
-            let parent_path = rh
-                .path
-                .0
-                .canonicalize()
-                .ok()
-                .and_then(|p| p.parent().map(|p| SysfsPath(p.to_owned())))?;
+            let parent_path = rh.path.0.parent().map(|p| SysfsPath(p.to_owned()))?;
 
-            debug!("Probing parent device {:?}", parent_path.0);
             let driver = parent_path.readlink_attr_filename("driver").ok();
 
             Some(BusInfo {