Skip to content

Commit 3a9ceb3

Browse files
bryantbiggsmxpv
authored andcommitted
chore: Update nix package to latest
1 parent 288cc80 commit 3a9ceb3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ members = [
88
"crates/shim-protos",
99
"crates/snapshots",
1010
]
11+
resolver = "2"
1112

1213
[profile.release]
1314
# Keep binary as small as possible
@@ -30,7 +31,7 @@ crossbeam = "0.8.1"
3031
futures = "0.3.19"
3132
libc = "0.2.112"
3233
log = {version = "0.4.2", features=["kv_unstable"]}
33-
nix = "0.28"
34+
nix = "0.29"
3435
oci-spec = "0.6"
3536
os_pipe = "1.1"
3637
prctl = "1.0.0"

crates/runc-shim/src/common.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ pub fn receive_socket(stream_fd: RawFd) -> containerd_shim::Result<OwnedFd> {
194194
let (path, fds) =
195195
match recvmsg::<UnixAddr>(stream_fd, &mut iovec, Some(&mut space), MsgFlags::empty()) {
196196
Ok(msg) => {
197-
let mut iter = msg.cmsgs();
198-
if let Some(ControlMessageOwned::ScmRights(fds)) = iter.next() {
197+
let iter = msg.cmsgs();
198+
if let Some(ControlMessageOwned::ScmRights(fds)) = iter?.next() {
199199
(iovec[0].deref(), fds)
200200
} else {
201201
return Err(other!("received message is empty"));

0 commit comments

Comments
 (0)