Merge pull request #2232 from stevvooe/cherry-pick-#2229

dmcgowan · web-flow · commit 21e89eb678c4 · 2018-03-26T13:19:29.000-07:00
[release/1.0] linux/prox: timeout fifo creation
diff --git a/linux/proc/exec.go b/linux/proc/exec.go
@@ -147,7 +147,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {
 		return e.parent.runtimeError(err, "OCI runtime exec failed")
 	}
 	if e.stdio.Stdin != "" {
-		sc, err := fifo.OpenFifo(ctx, e.stdio.Stdin, syscall.O_WRONLY|syscall.O_NONBLOCK, 0)
+		fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+		defer cancel()
+
+		sc, err := fifo.OpenFifo(fifoCtx, e.stdio.Stdin, syscall.O_WRONLY|syscall.O_NONBLOCK, 0)
 		if err != nil {
 			return errors.Wrapf(err, "failed to open stdin fifo %s", e.stdio.Stdin)
 		}
@@ -164,7 +167,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {
 			return errors.Wrap(err, "failed to start console copy")
 		}
 	} else if !e.stdio.IsNull() {
-		if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
+		fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+		defer cancel()
+
+		if err := copyPipes(fifoCtx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {
 			return errors.Wrap(err, "failed to start io pipe copy")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {`
`147`	`147`	`return e.parent.runtimeError(err, "OCI runtime exec failed")`
`148`	`148`	`}`
`149`	`149`	`if e.stdio.Stdin != "" {`
`150`		`- sc, err := fifo.OpenFifo(ctx, e.stdio.Stdin, syscall.O_WRONLY\|syscall.O_NONBLOCK, 0)`
	`150`	`+ fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)`
	`151`	`+ defer cancel()`
	`152`	`+`
	`153`	`+ sc, err := fifo.OpenFifo(fifoCtx, e.stdio.Stdin, syscall.O_WRONLY\|syscall.O_NONBLOCK, 0)`
`151`	`154`	`if err != nil {`
`152`	`155`	`return errors.Wrapf(err, "failed to open stdin fifo %s", e.stdio.Stdin)`
`153`	`156`	`}`
`@@ -164,7 +167,10 @@ func (e *execProcess) start(ctx context.Context) (err error) {`
`164`	`167`	`return errors.Wrap(err, "failed to start console copy")`
`165`	`168`	`}`
`166`	`169`	`} else if !e.stdio.IsNull() {`
`167`		`- if err := copyPipes(ctx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {`
	`170`	`+ fifoCtx, cancel := context.WithTimeout(ctx, 15*time.Second)`
	`171`	`+ defer cancel()`
	`172`	`+`
	`173`	`+ if err := copyPipes(fifoCtx, e.io, e.stdio.Stdin, e.stdio.Stdout, e.stdio.Stderr, &e.wg, &copyWaitGroup); err != nil {`
`168`	`174`	`return errors.Wrap(err, "failed to start io pipe copy")`
`169`	`175`	`}`
`170`	`176`	`}`