bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Check for non-zero return value from posix_spawn functions

Browse source 
The cvt function compares the argument with -1 and when equal returns a new
io::Error constructed from errno. It is used together posix_spawn_* functions.
This is incorrect. Those functions do not set errno. Instead they return
non-zero error code directly.

Check for non-zero return code and use it to construct a new io::Error.
This commit is contained in:
Tomasz Miąsko 2020-10-08 00:00:00 +00:00
parent 6b8d7911a1
commit 5faf25b95c
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
library/std/src/sys/unix/process/process_unix.rs
View file

@ -339,6 +339,10 @@ impl Command {
} }
} }
fn cvt_nz(error: libc::c_int) -> io::Result<()> {
if error == 0 { Ok(()) } else { Err(io::Error::from_raw_os_error(error)) }
}
unsafe { unsafe {
let mut file_actions = PosixSpawnFileActions(MaybeUninit::uninit()); let mut file_actions = PosixSpawnFileActions(MaybeUninit::uninit());
let mut attrs = PosixSpawnattr(MaybeUninit::uninit()); let mut attrs = PosixSpawnattr(MaybeUninit::uninit());
@ -347,51 +351,51 @@ impl Command {
libc::posix_spawn_file_actions_init(file_actions.0.as_mut_ptr()); libc::posix_spawn_file_actions_init(file_actions.0.as_mut_ptr());
if let Some(fd) = stdio.stdin.fd() { if let Some(fd) = stdio.stdin.fd() {
cvt(libc::posix_spawn_file_actions_adddup2( cvt_nz(libc::posix_spawn_file_actions_adddup2(
file_actions.0.as_mut_ptr(), file_actions.0.as_mut_ptr(),
fd, fd,
libc::STDIN_FILENO, libc::STDIN_FILENO,
))?; ))?;
} }
if let Some(fd) = stdio.stdout.fd() { if let Some(fd) = stdio.stdout.fd() {
cvt(libc::posix_spawn_file_actions_adddup2( cvt_nz(libc::posix_spawn_file_actions_adddup2(
file_actions.0.as_mut_ptr(), file_actions.0.as_mut_ptr(),
fd, fd,
libc::STDOUT_FILENO, libc::STDOUT_FILENO,
))?; ))?;
} }
if let Some(fd) = stdio.stderr.fd() { if let Some(fd) = stdio.stderr.fd() {
cvt(libc::posix_spawn_file_actions_adddup2( cvt_nz(libc::posix_spawn_file_actions_adddup2(
file_actions.0.as_mut_ptr(), file_actions.0.as_mut_ptr(),
fd, fd,
libc::STDERR_FILENO, libc::STDERR_FILENO,
))?; ))?;
} }
if let Some((f, cwd)) = addchdir { if let Some((f, cwd)) = addchdir {
cvt(f(file_actions.0.as_mut_ptr(), cwd.as_ptr()))?; cvt_nz(f(file_actions.0.as_mut_ptr(), cwd.as_ptr()))?;
} }
let mut set = MaybeUninit::<libc::sigset_t>::uninit(); let mut set = MaybeUninit::<libc::sigset_t>::uninit();
cvt(sigemptyset(set.as_mut_ptr()))?; cvt(sigemptyset(set.as_mut_ptr()))?;
cvt(libc::posix_spawnattr_setsigmask(attrs.0.as_mut_ptr(), set.as_ptr()))?; cvt_nz(libc::posix_spawnattr_setsigmask(attrs.0.as_mut_ptr(), set.as_ptr()))?;
cvt(sigaddset(set.as_mut_ptr(), libc::SIGPIPE))?; cvt(sigaddset(set.as_mut_ptr(), libc::SIGPIPE))?;
cvt(libc::posix_spawnattr_setsigdefault(attrs.0.as_mut_ptr(), set.as_ptr()))?; cvt_nz(libc::posix_spawnattr_setsigdefault(attrs.0.as_mut_ptr(), set.as_ptr()))?;
let flags = libc::POSIX_SPAWN_SETSIGDEF | libc::POSIX_SPAWN_SETSIGMASK; let flags = libc::POSIX_SPAWN_SETSIGDEF | libc::POSIX_SPAWN_SETSIGMASK;
cvt(libc::posix_spawnattr_setflags(attrs.0.as_mut_ptr(), flags as _))?; cvt_nz(libc::posix_spawnattr_setflags(attrs.0.as_mut_ptr(), flags as _))?;
// Make sure we synchronize access to the global `environ` resource // Make sure we synchronize access to the global `environ` resource
let _env_lock = sys::os::env_lock(); let _env_lock = sys::os::env_lock();
let envp = envp.map(|c| c.as_ptr()).unwrap_or_else(|| *sys::os::environ() as *const _); let envp = envp.map(|c| c.as_ptr()).unwrap_or_else(|| *sys::os::environ() as *const _);
let ret = libc::posix_spawnp( cvt_nz(libc::posix_spawnp(
&mut p.pid, &mut p.pid,
self.get_program_cstr().as_ptr(), self.get_program_cstr().as_ptr(),
file_actions.0.as_ptr(), file_actions.0.as_ptr(),
attrs.0.as_ptr(), attrs.0.as_ptr(),
self.get_argv().as_ptr() as *const _, self.get_argv().as_ptr() as *const _,
envp as *const _, envp as *const _,
); ))?;
if ret == 0 { Ok(Some(p)) } else { Err(io::Error::from_raw_os_error(ret)) } Ok(Some(p))
} }
} }
} }