Merge pull request #1242 from cgwalters/bump-rustix

Update to rustix 1.0

Author: cgwalters

Cargo.lock

@@ -54,7 +54,7 @@ indicatif = "0.17.0"
 fn-error-context = "0.2.1"
 libc = "0.2.154"
 openssl = "0.10.33"
-rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
+rustix = { "version" = "1", features = ["thread", "net", "fs", "system", "process", "mount"] }
 serde = "1.0.199"
 serde_json = "1.0.116"
 similar-asserts = "1.5.0"

Cargo.toml

@@ -2,6 +2,7 @@
 
 use std::{
     fs,
+    mem::MaybeUninit,
     os::fd::{AsFd, OwnedFd},
     process::Command,
 };
@@ -199,7 +200,7 @@ pub(crate) fn open_tree_from_pidns(
             // And send that file descriptor via fd passing over the socketpair.
             let fd = fd.as_fd();
             let fds = [fd];
-            let mut buffer = [0u8; rustix::cmsg_space!(ScmRights(1))];
+            let mut buffer = [MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
             let mut control = SendAncillaryBuffer::new(&mut buffer);
             let pushed = control.push(SendAncillaryMessage::ScmRights(&fds));
             assert!(pushed);
@@ -218,7 +219,7 @@ pub(crate) fn open_tree_from_pidns(
             let pid = rustix::process::Pid::from_raw(n).unwrap();
             drop(sock_child);
             // Receive the mount file descriptor from the child
-            let mut cmsg_space = vec![0; rustix::cmsg_space!(ScmRights(1))];
+            let mut cmsg_space = vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
             let mut cmsg_buffer = rustix::net::RecvAncillaryBuffer::new(&mut cmsg_space);
             let mut buf = [0u8; DUMMY_DATA.len()];
             let iov = std::io::IoSliceMut::new(buf.as_mut());
@@ -244,8 +245,9 @@ pub(crate) fn open_tree_from_pidns(
                 .next()
                 .ok_or_else(|| anyhow::anyhow!("Did not receive a file descriptor"))?;
             // SAFETY: Since we're not setting WNOHANG, this will always return Some().
-            let st =
-                rustix::process::waitpid(Some(pid), WaitOptions::empty())?.expect("Wait status");
+            let st = rustix::process::waitpid(Some(pid), WaitOptions::empty())?
+                .expect("Wait status")
+                .1;
             if let Some(0) = st.exit_status() {
                 Ok(r)
             } else {

lib/src/mount.rs

@@ -155,8 +155,7 @@ fn get_keys_from_files(user: &uzers::User, keyfiles: &Vec<&str>) -> Result<Vec<P
         }
 
         // Safety: The UID should be valid because we got it from uzers
-        #[allow(unsafe_code)]
-        let user_uid = unsafe { Uid::from_raw(user.uid()) };
+        let user_uid = Uid::from_raw(user.uid());
 
         // Change the effective uid for this scope, to avoid accidentally reading files we
         // shouldn't through symlinks

system-reinstall-bootc/src/users.rs

@@ -101,7 +101,7 @@ impl CommandRunExt for Command {
         unsafe {
             self.pre_exec(|| {
                 rustix::process::set_parent_process_death_signal(Some(
-                    rustix::process::Signal::Term,
+                    rustix::process::Signal::TERM,
                 ))
                 .map_err(Into::into)
             })