-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Reopen standard file descriptors when they are missing on Unix #75295
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -75,6 +75,13 @@ pub use crate::sys_common::os_str_bytes as os_str; | |||||
|
||||||
#[cfg(not(test))] | ||||||
pub fn init() { | ||||||
// The standard streams might be closed on application startup. To prevent | ||||||
// std::io::{stdin, stdout,stderr} objects from using other unrelated file | ||||||
// resources opened later, we reopen standards streams when they are closed. | ||||||
unsafe { | ||||||
sanitize_standard_fds(); | ||||||
} | ||||||
|
||||||
// By default, some platforms will send a *signal* when an EPIPE error | ||||||
// would otherwise be delivered. This runtime doesn't install a SIGPIPE | ||||||
// handler, causing it to kill the program, which isn't exactly what we | ||||||
|
@@ -86,6 +93,61 @@ pub fn init() { | |||||
reset_sigpipe(); | ||||||
} | ||||||
|
||||||
// In the case when all file descriptors are open, the poll has been | ||||||
// observed to perform better than fcntl (on GNU/Linux). | ||||||
#[cfg(not(any( | ||||||
miri, | ||||||
target_os = "emscripten", | ||||||
target_os = "fuchsia", | ||||||
// The poll on Darwin doesn't set POLLNVAL for closed fds. | ||||||
target_os = "macos", | ||||||
target_os = "ios", | ||||||
target_os = "redox", | ||||||
)))] | ||||||
unsafe fn sanitize_standard_fds() { | ||||||
use crate::sys::os::errno; | ||||||
let pfds: &mut [_] = &mut [ | ||||||
libc::pollfd { fd: 0, events: 0, revents: 0 }, | ||||||
libc::pollfd { fd: 1, events: 0, revents: 0 }, | ||||||
libc::pollfd { fd: 2, events: 0, revents: 0 }, | ||||||
]; | ||||||
while libc::poll(pfds.as_mut_ptr(), 3, 0) == -1 { | ||||||
if errno() == libc::EINTR { | ||||||
continue; | ||||||
} | ||||||
libc::abort(); | ||||||
} | ||||||
for pfd in pfds { | ||||||
if pfd.revents & libc::POLLNVAL == 0 { | ||||||
continue; | ||||||
} | ||||||
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
tmiasko marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
// If the stream is closed but we failed to reopen it, abort the | ||||||
// process. Otherwise we wouldn't preserve the safety of | ||||||
// operations on the corresponding Rust object Stdin, Stdout, or | ||||||
// Stderr. | ||||||
libc::abort(); | ||||||
} | ||||||
} | ||||||
} | ||||||
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "redox"))] | ||||||
unsafe fn sanitize_standard_fds() { | ||||||
use crate::sys::os::errno; | ||||||
for fd in 0..3 { | ||||||
if libc::fcntl(fd, libc::F_GETFD) == -1 && errno() == libc::EBADF { | ||||||
if libc::open("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 { | ||||||
libc::abort(); | ||||||
} | ||||||
} | ||||||
} | ||||||
} | ||||||
#[cfg(any( | ||||||
// The standard fds are always available in Miri. | ||||||
miri, | ||||||
target_os = "emscripten", | ||||||
target_os = "fuchsia"))] | ||||||
unsafe fn sanitize_standard_fds() {} | ||||||
tmiasko marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
#[cfg(not(any(target_os = "emscripten", target_os = "fuchsia")))] | ||||||
unsafe fn reset_sigpipe() { | ||||||
assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR); | ||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.