Merge pull request #251 from losynix/upstream_udev

Use upstream udev-rs
cea-sec · Apr 6, 2023 · bb302c8 · bb302c8
2 parents e87c97f + d35a593
commit bb302c8
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/usbsas-usbdev/Cargo.toml b/usbsas-usbdev/Cargo.toml
@@ -9,7 +9,7 @@ env_logger = "0.10"
 log = "0.4"
 mio = { version = "0.8", features = ["os-ext"] }
 thiserror = "1.0"
-udev = { git = "https://github.com/losynix/udev-rs", branch = "socket_fd_from_monitor", features = ["mio"] }
+udev = { git = "https://github.com/Smithay/udev-rs", rev = "ae6f8faf0418fe3ba7d80a4aa239e247b4f3e75e", features = ["mio"] }
 usbsas-comm = { path = "../usbsas-comm" }
 usbsas-config = { path = "../usbsas-config" }
 usbsas-mock = { path = "../usbsas-mock", optional = true }

diff --git a/usbsas-usbdev/src/lib.rs b/usbsas-usbdev/src/lib.rs
@@ -64,7 +64,7 @@ fn handle_udev_events(
     let monitor = udev::MonitorBuilder::new()?.match_subsystem_devtype("usb", "usb_device")?;
     let mut poll = Poll::new()?;
 
-    usbsas_sandbox::usbdev::seccomp_thread(monitor.socket_raw_fd(), poll.as_raw_fd())?;
+    usbsas_sandbox::usbdev::seccomp_thread(monitor.as_raw_fd(), poll.as_raw_fd())?;
 
     let config = conf_parse(&config)?;