jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rewrite popen to use posix_spawn instead of fragile vfork hacks

Browse source
This commit is contained in:
Rich Felker 2013-03-24 22:41:38 -04:00
commit 9cb6e6ea12
1 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/stdio/popen.c
View file

@ -2,28 +2,23 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <spawn.h>
#include "stdio_impl.h" #include "stdio_impl.h"
#include "pthread_impl.h"
#include "syscall.h" #include "syscall.h"
static void dummy_0() extern char **__environ;
{
}
weak_alias(dummy_0, __acquire_ptc);
weak_alias(dummy_0, __release_ptc);
pid_t __vfork(void);
FILE *popen(const char *cmd, const char *mode) FILE *popen(const char *cmd, const char *mode)
{ {
int p[2], op, i; int p[2], op, e;
pid_t pid; pid_t pid;
FILE *f; FILE *f;
sigset_t old; posix_spawn_file_actions_t fa;
const char *modes = "rw", *mi = strchr(modes, *mode);
if (mi) { if (*mode == 'r') {
op = mi-modes; op = 0;
} else if (*mode == 'w') {
op = 1;
} else { } else {
errno = EINVAL; errno = EINVAL;
return 0; return 0;
@ -36,38 +31,43 @@ FILE *popen(const char *cmd, const char *mode)
__syscall(SYS_close, p[1]); __syscall(SYS_close, p[1]);
return NULL; return NULL;
} }
FLOCK(f);
sigprocmask(SIG_BLOCK, SIGALL_SET, &old); /* If the child's end of the pipe happens to already be on the final
* fd number to which it will be assigned (either 0 or 1), it must
__acquire_ptc(); * be moved to a different fd. Otherwise, there is no safe way to
pid = __vfork(); * remove the close-on-exec flag in the child without also creating
* a file descriptor leak race condition in the parent. */
if (pid) { if (p[1-op] == 1-op) {
__release_ptc(); int tmp = fcntl(F_DUPFD_CLOEXEC, 1-op, 0);
if (tmp < 0) {
e = errno;
goto fail;
}
__syscall(SYS_close, p[1-op]); __syscall(SYS_close, p[1-op]);
sigprocmask(SIG_SETMASK, &old, 0); p[1-op] = tmp;
if (pid < 0) {
fclose(f);
return 0;
}
f->pipe_pid = pid;
return f;
} }
/* See notes in system.c for why this is needed. */ e = ENOMEM;
for (i=1; i<=8*__SYSCALL_SSLEN; i++) { if (!posix_spawn_file_actions_init(&fa)) {
struct sigaction sa; if (!posix_spawn_file_actions_adddup2(&fa, p[1-op], 1-op)) {
__libc_sigaction(i, 0, &sa); if (!(e = posix_spawn(&pid, "/bin/sh", &fa, 0,
if (sa.sa_handler!=SIG_IGN && sa.sa_handler!=SIG_DFL) { (char *[]){ "sh", "-c", (char *)cmd, 0 }, __environ))) {
sa.sa_handler = SIG_DFL; posix_spawn_file_actions_destroy(&fa);
__libc_sigaction(i, &sa, 0); f->pipe_pid = pid;
if (!strchr(mode, 'e'))
fcntl(p[op], F_SETFD, 0);
__syscall(SYS_close, p[1-op]);
FUNLOCK(f);
return f;
}
} }
posix_spawn_file_actions_destroy(&fa);
} }
if (dup2(p[1-op], 1-op) < 0) _exit(127); fail:
fcntl(1-op, F_SETFD, 0); fclose(f);
if (p[0] != 1-op) __syscall(SYS_close, p[0]); __syscall(SYS_close, p[1-op]);
if (p[1] != 1-op) __syscall(SYS_close, p[1]);
sigprocmask(SIG_SETMASK, &old, 0); errno = e;
execl("/bin/sh", "sh", "-c", cmd, (char *)0); return 0;
_exit(127);
} }