rootlessport: detect rootless-child exit

otherwise the rootless parent process might wait indefinitely when the rootless-child process exits early. Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Mar 12, 2020 · 647dc33 · 647dc33
1 parent 78e0900
commit 647dc33
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkg/rootlessport/rootlessport_linux.go b/pkg/rootlessport/rootlessport_linux.go
@@ -160,6 +160,13 @@ func parent() error {
 		return err
 	}
 
+	childErrCh := make(chan error)
+	go func() {
+		err := cmd.Wait()
+		childErrCh <- err
+		close(childErrCh)
+	}()
+
 	defer func() {
 		if err := syscall.Kill(cmd.Process.Pid, syscall.SIGTERM); err != nil {
 			logrus.WithError(err).Warn("kill child process")
@@ -174,6 +181,10 @@ outer:
 		case <-initComplete:
 			logrus.Infof("initComplete is closed; parent and child established the communication channel")
 			break outer
+		case err := <-childErrCh:
+			if err != nil {
+				return err
+			}
 		case err := <-errCh:
 			if err != nil {
 				return err