diff options
author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-02-28 12:50:17 +0100 |
---|---|---|
committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-02-28 12:50:17 +0100 |
commit | 45d1d31847dfc425410a107b66537e567c0d5637 (patch) | |
tree | abd032eae3933f8ad533e962653d23f94a3e06b1 /sys/src/libthread | |
parent | 1d2ce3583ec377f16a1f801f624344de99bc9ddc (diff) |
libthread: use devdup instead of mounting pipe to /mnt/temp for close-on-exec in procexec()
the namespace might be shared by other processes. instead, we
create a anonymous pipe with pipe() and use devdup to open one
end close-on-exec. this is shorter and avoids the race condition.
do not touch Execargs after writing the error message as the
process might be gone after the write. this was to manually
close the fd which isnt neccesary as the kernel will do it
for us on the following exit.
Diffstat (limited to 'sys/src/libthread')
-rw-r--r-- | sys/src/libthread/exec.c | 16 | ||||
-rw-r--r-- | sys/src/libthread/main.c | 1 |
2 files changed, 6 insertions, 11 deletions
diff --git a/sys/src/libthread/exec.c b/sys/src/libthread/exec.c index b93eeb28f..3bfbda3c6 100644 --- a/sys/src/libthread/exec.c +++ b/sys/src/libthread/exec.c @@ -3,8 +3,6 @@ #include <thread.h> #include "threadimpl.h" -#define PIPEMNT "/mnt/temp" - void procexec(Channel *pidc, char *prog, char *args[]) { @@ -36,18 +34,16 @@ procexec(Channel *pidc, char *prog, char *args[]) * then the proc doing the exec sends the errstr down the * pipe to us. */ - if(bind("#|", PIPEMNT, MREPL) < 0) - goto Bad; - if((p->exec.fd[0] = open(PIPEMNT "/data", OREAD)) < 0){ - unmount(nil, PIPEMNT); + if(pipe(p->exec.fd) < 0) goto Bad; - } - if((p->exec.fd[1] = open(PIPEMNT "/data1", OWRITE|OCEXEC)) < 0){ + snprint(p->exitstr, ERRMAX, "/fd/%d", p->exec.fd[1]); + if((n = open(p->exitstr, OWRITE|OCEXEC)) < 0){ close(p->exec.fd[0]); - unmount(nil, PIPEMNT); + close(p->exec.fd[1]); goto Bad; } - unmount(nil, PIPEMNT); + close(p->exec.fd[1]); + p->exec.fd[1] = n; /* exec in parallel via the scheduler */ assert(p->needexec==0); diff --git a/sys/src/libthread/main.c b/sys/src/libthread/main.c index 03c069c14..708b65ed1 100644 --- a/sys/src/libthread/main.c +++ b/sys/src/libthread/main.c @@ -114,7 +114,6 @@ efork(Execargs *e) if(buf[0]=='\0') strcpy(buf, "exec failed"); write(e->fd[1], buf, strlen(buf)); - close(e->fd[1]); _exits(buf); } |