Skip to content

fix: dup() fd before from_raw_fd to prevent double-close #20

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
yasinlex wants to merge 1 commit into
base: v0.3.x
Choose a base branch
from
Open

fix: dup() fd before from_raw_fd to prevent double-close #20

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
13 changes: 12 additions & 1 deletion executor/src/host/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,18 @@ impl Host {
let fd: i32 = fd_str
.parse()
.with_context(|| format!("parsing fd number from '{fd_str}'"))?;
let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(fd) };
// SAFETY: The caller owns `fd` and expects us to use it, not
// consume it. `from_raw_fd` takes ownership and would close the
// original fd on drop, so we must dup() first to get an
// independent copy that this Host can safely own and close.
let duped = unsafe { libc::dup(fd) };
if duped < 0 {
anyhow::bail!(
"failed to dup fd {fd}: {}",
std::io::Error::last_os_error()
);
}
let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(duped) };
Box::new(bufreaderwriter::seq::BufReaderWriterSeq::new_writer(stream))
} else {
Box::new(bufreaderwriter::seq::BufReaderWriterSeq::new_writer(
Expand Down