containerd
/
rust-extensions
mirror of https://github.com/containerd/rust-extensions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update nix to 0.30 

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2025-08-28 16:38:58 -07:00
parent f74cf7402e
commit cad809b01c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -31,7 +31,7 @@ crossbeam = "0.8.1"
futures = "0.3.19"
libc = "0.2.112"
log = {version = "0.4.2", features=["kv_unstable"]}
nix = "0.29"
nix = "0.30"
oci-spec = "0.7"
os_pipe = "1.1"
prctl = "1.0.0"

6
crates/runc/src/asynchronous/io.rs
View File

@ -14,7 +14,7 @@
limitations under the License.
*/
use std::{fmt::Debug, io::Result, os::unix::io::AsRawFd, process::Stdio};
use std::{fmt::Debug, io::Result, process::Stdio};
use async_trait::async_trait;
use nix::unistd::{Gid, Uid};
@ -67,10 +67,10 @@ impl PipedIo {
let gid = Some(Gid::from_raw(gid));
if stdin {
let rd = pipe.rd.try_clone()?;
nix::unistd::fchown(rd.as_raw_fd(), uid, gid)?;
nix::unistd::fchown(rd, uid, gid)?;
} else {
let wr = pipe.wr.try_clone()?;
nix::unistd::fchown(wr.as_raw_fd(), uid, gid)?;
nix::unistd::fchown(wr, uid, gid)?;
}
Ok(Some(pipe))
}

6
crates/runc/src/synchronous/io.rs
View File

@ -18,7 +18,7 @@ use std::{
fmt::Debug,
fs::{File, OpenOptions},
io::Result,
os::unix::{fs::OpenOptionsExt, io::AsRawFd},
os::unix::fs::OpenOptionsExt,
process::Stdio,
sync::Mutex,
};
@ -72,10 +72,10 @@ impl PipedIo {
let gid = Some(Gid::from_raw(gid));
if stdin {
let rd = pipe.rd.try_clone()?;
nix::unistd::fchown(rd.as_raw_fd(), uid, gid)?;
nix::unistd::fchown(rd, uid, gid)?;
} else {
let wr = pipe.wr.try_clone()?;
nix::unistd::fchown(wr.as_raw_fd(), uid, gid)?;
nix::unistd::fchown(wr, uid, gid)?;
}
Ok(Some(pipe))
}

5
crates/shim/src/util.rs
View File

@ -120,8 +120,11 @@ pub fn connect(address: impl AsRef<str>) -> Result<RawFd> {
// so there is a chance of leak if fork + exec happens in between of these calls.
#[cfg(not(target_os = "linux"))]
{
use std::os::fd::BorrowedFd;
use nix::fcntl::{fcntl, FcntlArg, FdFlag};
fcntl(fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC)).map_err(|e| {
// SAFETY: fd is a valid file descriptor that we just created
let borrowed_fd = unsafe { BorrowedFd::borrow_raw(fd) };
fcntl(borrowed_fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC)).map_err(|e| {
let _ = close(fd);
e
})?;