Bump nix from 0.24.0 to 0.24.1 (#867)

Signed-off-by: Furisto <24721048+Furisto@users.noreply.github.com>

Cargo.lock

@@ -994,7 +994,7 @@ dependencies = [
  "libcgroups",
  "libcontainer",
  "log",
- "nix 0.23.1",
+ "nix",
  "num_cpus",
  "oci-spec 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell",
@@ -1093,7 +1093,7 @@ dependencies = [
  "libc",
  "log",
  "mockall",
- "nix 0.24.1",
+ "nix",
  "oci-spec 0.5.5 (git+https://github.com/containers/oci-spec-rs?rev=89376af)",
  "procfs",
  "quickcheck",
@@ -1120,7 +1120,7 @@ dependencies = [
  "libseccomp",
  "log",
  "mio",
- "nix 0.24.1",
+ "nix",
  "oci-spec 0.5.5 (git+https://github.com/containers/oci-spec-rs?rev=89376af)",
  "path-clean",
  "prctl",
@@ -1347,19 +1347,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
 
-[[package]]
-name = "nix"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nix"
 version = "0.24.1"
@@ -1647,7 +1634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
 dependencies = [
  "libc",
- "nix 0.24.1",
+ "nix",
 ]
 
 [[package]]
@@ -1961,7 +1948,7 @@ dependencies = [
 name = "runtimetest"
 version = "0.0.1"
 dependencies = [
- "nix 0.23.1",
+ "nix",
  "oci-spec 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2906,7 +2893,7 @@ dependencies = [
  "libcontainer",
  "liboci-cli",
  "log",
- "nix 0.24.1",
+ "nix",
  "oci-spec 0.5.5 (git+https://github.com/containers/oci-spec-rs?rev=89376af)",
  "once_cell",
  "pentacle",

crates/libcgroups/Cargo.toml

@@ -21,7 +21,7 @@ systemd = ["v2", "dbus"]
 cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc"]
 
 [dependencies]
-nix = "0.24.0"
+nix = "0.24.1"
 procfs = "0.12.0"
 log = "0.4"
 anyhow = "1.0"

crates/libcontainer/Cargo.toml

@@ -28,7 +28,7 @@ futures = { version = "0.3", features = ["thread-pool"] }
 libc = "0.2.124"
 log = "0.4"
 mio = { version = "0.8.2", features = ["os-ext", "os-poll"] }
-nix = "0.24.0"
+nix = "0.24.1"
 oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af" }
 path-clean = "0.1.0"
 procfs = "0.12.0"

crates/youki/Cargo.toml

@@ -24,7 +24,7 @@ libcgroups = { version = "0.0.3", path = "../libcgroups" }
 libcontainer = { version = "0.0.3", path = "../libcontainer" }
 liboci-cli = { version = "0.0.3", path = "../liboci-cli" }
 log = { version = "0.4", features = ["std"]}
-nix = "0.24.0"
+nix = "0.24.1"
 oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "89376af" }
 once_cell = "1.10.0"
 pentacle = "1.0.0"

tests/rust-integration-tests/integration_test/Cargo.toml

@@ -10,7 +10,7 @@ flate2 = "1.0"
 libcgroups = { path = "../../../crates/libcgroups" }
 libcontainer = { path = "../../../crates/libcontainer" }
 log = { version = "0.4", features = ["std"] }
-nix = "0.23.1"
+nix = "0.24.1"
 num_cpus = "1.13"
 oci-spec = "0.5.5"
 once_cell = "1.10.0"

tests/rust-integration-tests/integration_test/src/tests/seccomp_notify/seccomp_agent.rs

@@ -1,10 +1,10 @@
 use anyhow::{bail, Context, Result};
 use libcontainer::container::ContainerProcessState;
 use nix::{
-    sys::{socket, uio},
+    sys::socket::{self, UnixAddr},
     unistd,
 };
-use std::{os::unix::prelude::RawFd, path::Path};
+use std::{io::IoSliceMut, os::unix::prelude::RawFd, path::Path};
 
 const DEFAULT_BUFFER_SIZE: usize = 4096;
 
@@ -16,7 +16,7 @@ pub type SeccompAgentResult = Result<(ContainerProcessState, RawFd)>;
 // returning, since we only expect at most 1 connection to the listener based on
 // the spec.
 pub fn recv_seccomp_listener(seccomp_listener: &Path) -> SeccompAgentResult {
-    let addr = socket::SockAddr::new_unix(seccomp_listener)?;
+    let addr = socket::UnixAddr::new(seccomp_listener)?;
     let socket = socket::socket(
         socket::AddressFamily::Unix,
         socket::SockType::Stream,
@@ -37,10 +37,10 @@ pub fn recv_seccomp_listener(seccomp_listener: &Path) -> SeccompAgentResult {
     };
     let mut cmsgspace = nix::cmsg_space!([RawFd; 1]);
     let mut buf = vec![0u8; DEFAULT_BUFFER_SIZE];
-    let iov = [uio::IoVec::from_mut_slice(&mut buf)];
-    let msg = match socket::recvmsg(
+    let mut iov = [IoSliceMut::new(&mut buf)];
+    let msg = match socket::recvmsg::<UnixAddr>(
         conn,
-        &iov,
+        &mut iov,
         Some(&mut cmsgspace),
         socket::MsgFlags::MSG_CMSG_CLOEXEC,
     ) {

tests/rust-integration-tests/runtimetest/Cargo.toml

@@ -5,4 +5,4 @@ edition = "2021"
 
 [dependencies]
 oci-spec = "0.5.5"
-nix = "0.23.1"
+nix = "0.24.1"