mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

base: unix: add set_descriptor_cloexec()

Browse source 
Clean up and refactor the existing clear_*_flags() to allow adding
O_CLOEXEC as well.

Change-Id: Idad76537e3a0d8ed52780bca1723b40c7115a498
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5251100
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Frederick Mayle <fmayle@google.com>
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
This commit is contained in:
Daniel Verkamp 2024-01-30 15:15:32 -08:00 committed by crosvm LUCI
parent 58a06581bc
commit 7c5e1f25be
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
base/src/sys/unix/descriptor.rs
View file

@ -53,25 +53,37 @@ fn clone_fd(fd: &dyn AsRawFd) -> Result<RawFd> {
}
}
/// Clears CLOEXEC flag on descriptor
pub fn clear_descriptor_cloexec<A: AsRawDescriptor>(fd_owner: &A) -> Result<()> {
clear_fd_cloexec(&fd_owner.as_raw_descriptor())
/// Adds CLOEXEC flag on descriptor
pub fn set_descriptor_cloexec<A: AsRawDescriptor>(fd_owner: &A) -> Result<()> {
modify_descriptor_flags(fd_owner.as_raw_descriptor(), |flags| {
flags | libc::FD_CLOEXEC
})
}
/// Clears CLOEXEC flag on fd
fn clear_fd_cloexec<A: AsRawFd>(fd_owner: &A) -> Result<()> {
let fd = fd_owner.as_raw_fd();
/// Clears CLOEXEC flag on descriptor
pub fn clear_descriptor_cloexec<A: AsRawDescriptor>(fd_owner: &A) -> Result<()> {
modify_descriptor_flags(fd_owner.as_raw_descriptor(), |flags| {
flags & !libc::FD_CLOEXEC
})
}
/// Apply the specified modification to the file descriptor's flags.
fn modify_descriptor_flags(
desc: RawDescriptor,
modify_flags: impl FnOnce(libc::c_int) -> libc::c_int,
) -> Result<()> {
// SAFETY:
// Safe because fd is read only.
let flags = unsafe { libc::fcntl(fd, libc::F_GETFD) };
let flags = unsafe { libc::fcntl(desc, libc::F_GETFD) };
if flags == -1 {
return errno_result();
}
let masked_flags = flags & !libc::FD_CLOEXEC;
let new_flags = modify_flags(flags);
// SAFETY:
// Safe because this has no side effect(s) on the current process.
if masked_flags != flags && unsafe { libc::fcntl(fd, libc::F_SETFD, masked_flags) } == -1 {
if new_flags != flags && unsafe { libc::fcntl(desc, libc::F_SETFD, new_flags) } == -1 {
errno_result()
} else {
Ok(())