Skip to content

fix from_process_at return error in old kernel #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix from_process_at return error in old kernel #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions src/process/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,26 +890,10 @@ impl FDInfo {
/// Gets a file descriptor from a directory fd and a path relative to it.
///
/// `base` is the path to the directory fd, and is used for error messages.
fn from_process_at<P: AsRef<Path>, Q: AsRef<Path>>(
base: P,
dirfd: BorrowedFd,
path: Q,
fd: i32,
) -> ProcResult<Self> {
fn from_process_at<Q: AsRef<Path>>(dirfd: BorrowedFd, path: Q, fd: i32) -> ProcResult<Self> {
let p = path.as_ref();
let root = base.as_ref().join(p);
let file = wrap_io_error!(
root,
rustix::fs::openat(
dirfd,
p,
OFlags::NOFOLLOW | OFlags::PATH | OFlags::CLOEXEC,
Mode::empty()
)
)?;
let link = rustix::fs::readlinkat(&file, "", Vec::new()).map_err(io::Error::from)?;
let md =
rustix::fs::statat(&file, "", AtFlags::SYMLINK_NOFOLLOW | AtFlags::EMPTY_PATH).map_err(io::Error::from)?;
let link = rustix::fs::readlinkat(&dirfd, p, Vec::new()).map_err(io::Error::from)?;
let md = rustix::fs::statat(&dirfd, p, AtFlags::empty()).map_err(io::Error::from)?;

let link_os = link.to_string_lossy();
let target = FDTarget::from_str(link_os.as_ref())?;
Expand Down Expand Up @@ -1217,13 +1201,12 @@ impl Process {
Ok(FDsIter {
inner: dir,
inner_fd: dir_fd,
root: self.root.clone(),
})
}

pub fn fd_from_fd(&self, fd: i32) -> ProcResult<FDInfo> {
let path = PathBuf::from("fd").join(fd.to_string());
FDInfo::from_process_at(&self.root, self.fd.as_fd(), path, fd)
FDInfo::from_process_at(self.fd.as_fd(), path, fd)
}

/// Lists which memory segments are written to the core dump in the event that a core dump is performed.
Expand Down Expand Up @@ -1583,7 +1566,6 @@ impl Process {
pub struct FDsIter {
inner: rustix::fs::Dir,
inner_fd: rustix::fd::OwnedFd,
root: PathBuf,
}

impl std::iter::Iterator for FDsIter {
Expand All @@ -1594,8 +1576,7 @@ impl std::iter::Iterator for FDsIter {
Some(Ok(entry)) => {
let name = entry.file_name().to_string_lossy();
if let Ok(fd) = RawFd::from_str(&name) {
if let Ok(info) = FDInfo::from_process_at(&self.root, self.inner_fd.as_fd(), name.as_ref(), fd)
{
if let Ok(info) = FDInfo::from_process_at(self.inner_fd.as_fd(), name.as_ref(), fd) {
break Some(Ok(info));
}
}
Expand Down