Merge pull request #3624 from mulkieran/nix-0.29.0

Increase nix dependency lower bound to 0.29.0
stratis-storage · Jun 24, 2024 · b21f309 · b21f309
2 parents 57f48c3 + f346d75
commit b21f309
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -354,7 +354,7 @@ fn try_recvmsg(fd: RawFd) -> StratisResult<StratisParams> {
     let (cmsgs, bytes) = {
         let mut iovecs = [IoSliceMut::new(vec.as_mut_slice())];
         let rmsg = recvmsg::<UnixAddr>(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)?;