diff --git a/Cargo.lock b/Cargo.lock index ab1c0b2413..cec174be3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -250,6 +250,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.26" @@ -772,9 +778,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcryptsetup-rs" @@ -938,7 +944,19 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.4.0", "cfg-if 1.0.0", - "cfg_aliases", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.4.0", + "cfg-if 1.0.0", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -1322,7 +1340,7 @@ dependencies = [ "libudev", "log", "loopdev-3", - "nix 0.28.0", + "nix 0.29.0", "once_cell", "pkg-config", "predicates", diff --git a/Cargo.toml b/Cargo.toml index 9108810c1a..69091f5438 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ version = "0.4.19" optional = true [dependencies.nix] -version = "0.28.0" +version = "0.29.0" optional = true features = ["fs", "ioctl", "mount", "poll", "process", "sched", "signal", "socket"] diff --git a/src/jsonrpc/server/server.rs b/src/jsonrpc/server/server.rs index 632147c1f4..e791f7d1a8 100644 --- a/src/jsonrpc/server/server.rs +++ b/src/jsonrpc/server/server.rs @@ -354,7 +354,7 @@ fn try_recvmsg(fd: RawFd) -> StratisResult { let (cmsgs, bytes) = { let mut iovecs = [IoSliceMut::new(vec.as_mut_slice())]; let rmsg = recvmsg::(fd, &mut iovecs, Some(&mut cmsg_space), MsgFlags::empty())?; - (rmsg.cmsgs().collect(), rmsg.bytes) + (rmsg.cmsgs()?.collect(), rmsg.bytes) }; let fd_opt = handle_cmsgs(cmsgs)?;