Merge pull request #980 from LK4D4/safer_hook_run

libcontainer/configs: make hooks run safer

libcontainer/configs/config.go

@@ -300,29 +300,38 @@ func (c Command) Run(s HookState) error {
 	if err != nil {
 		return err
 	}
+	var stdout, stderr bytes.Buffer
 	cmd := exec.Cmd{
-		Path:  c.Path,
+		Path:   c.Path,
-		Args:  c.Args,
+		Args:   c.Args,
-		Env:   c.Env,
+		Env:    c.Env,
-		Stdin: bytes.NewReader(b),
+		Stdin:  bytes.NewReader(b),
+		Stdout: &stdout,
+		Stderr: &stderr,
+	}
+	if err := cmd.Start(); err != nil {
+		return err
 	}
 	errC := make(chan error, 1)
 	go func() {
-		out, err := cmd.CombinedOutput()
+		err := cmd.Wait()
 		if err != nil {
-			err = fmt.Errorf("%s: %s", err, out)
+			err = fmt.Errorf("error running hook: %v, stdout: %s, stderr: %s", err, stdout.String(), stderr.String())
 		}
 		errC <- err
 	}()
+	var timerCh <-chan time.Time
 	if c.Timeout != nil {
-		select {
+		timer := time.NewTimer(*c.Timeout)
-		case err := <-errC:
+		defer timer.Stop()
-			return err
+		timerCh = timer.C
-		case <-time.After(*c.Timeout):
+	}
-			cmd.Process.Kill()
+	select {
-			cmd.Wait()
+	case err := <-errC:
-			return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds())
+		return err
-		}
+	case <-timerCh:
+		cmd.Process.Kill()
+		cmd.Wait()
+		return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds())
 	}
-	return <-errC
 }