aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2016-01-22 18:09:32 +0100
committerDmitry Vyukov <dvyukov@google.com>2016-01-22 18:09:32 +0100
commit1e06d2bafc30d2b602e73a1e91c312916d5f6d86 (patch)
tree16a471f591ab6a75db93a6e4571a39b0841f2b2b /ipc
parent324760426521955471c52731a4786d9592c83fd2 (diff)
executor: new namespace-based sandbox
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc.go9
1 files changed, 1 insertions, 8 deletions
diff --git a/ipc/ipc.go b/ipc/ipc.go
index 756524e51..6424f83cf 100644
--- a/ipc/ipc.go
+++ b/ipc/ipc.go
@@ -42,7 +42,6 @@ const (
FlagCollide // collide syscalls to provoke data races
FlagDedupCover // deduplicate coverage in executor
FlagDropPrivs // impersonate nobody user
- FlagNoSetpgid // don't use setpgid
FlagStrace // run executor under strace
)
@@ -372,6 +371,7 @@ func (c *command) kill() {
func (c *command) exec() (output, strace []byte, failed, hanged bool, err0 error) {
var tmp [1]byte
if _, err := c.outwp.Write(tmp[:]); err != nil {
+ output, _ = ioutil.ReadAll(c.rp)
err0 = fmt.Errorf("failed to write control pipe: %v", err)
return
}
@@ -391,13 +391,6 @@ func (c *command) exec() (output, strace []byte, failed, hanged bool, err0 error
//!!! handle c.rp overflow
_, readErr := c.inrp.Read(tmp[:])
close(done)
- fileutil.UmountAll(c.dir)
- os.RemoveAll(c.dir)
- if err := os.Mkdir(c.dir, 0777); err != nil {
- <-hang
- err0 = fmt.Errorf("failed to create temp dir: %v", err)
- return
- }
if readErr == nil {
<-hang
return