kozorizki/pve-lxc-syscalld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert pidfd_open patches

Browse Source 
They act like proc fds but aren't opened with O_DIRECTORY,
so we cannot use `openat()` yet. Maybe with a future kernel
extension...

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-01-29 14:38:41 +01:00
parent edf4f4b9dd
commit b2564ece43
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/process/pid_fd.rs
View File

@ -1,6 +1,6 @@
//! pidfd helper functionality
use std::ffi::{CStr, OsString};
use std::ffi::{CStr, CString, OsString};
use std::io::{self, BufRead, BufReader};
use std::os::raw::c_int;
use std::os::unix::ffi::OsStringExt;
@ -18,16 +18,17 @@ use super::{CGroups, IdMap, IdMapEntry, ProcStatus, Uids, UserCaps};
pub struct PidFd(RawFd, pid_t);
file_descriptor_impl!(PidFd);
pub const SYS_PIDFD_OPEN: libc::c_long = 434; // asm-generic
impl PidFd {
pub fn current() -> io::Result<Self> {
Self::open(unsafe { libc::getpid() })
}
pub fn open(pid: pid_t) -> io::Result<Self> {
let fd = c_try!(unsafe { libc::syscall(SYS_PIDFD_OPEN, pid, 0) });
Ok(Self(fd as RawFd, pid))
let path = CString::new(format!("/proc/{}", pid)).unwrap();
let fd = c_try!(unsafe { libc::open(path.as_ptr(), libc::O_DIRECTORY | libc::O_CLOEXEC) });
Ok(Self(fd, pid))
}
/// Turn a valid pid file descriptor into a PidFd.