From cc411dd98fed42a19d2d4f8ec1922ba62da49957 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri, 8 Mar 2019 16:36:49 +0100
Subject: [PATCH] rootless: propagate errors from info

we use "podman info" to reconfigure the runtime after a reboot, but we
don't propagate the error message back if something goes wrong.

Closes: https://github.com/containers/libpod/issues/2584

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 libpod/runtime.go              | 9 ++++++---
 pkg/rootless/rootless_linux.c  | 2 ++
 pkg/rootless/rootless_linux.go | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 482cd9d73f..9667abfe62 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -971,9 +971,12 @@ func (r *Runtime) refreshRootless() error {
 	// Take advantage of a command that requires a new userns
 	// so that we are running as the root user and able to use refresh()
 	cmd := exec.Command(os.Args[0], "info")
-	err := cmd.Run()
-	if err != nil {
-		return errors.Wrapf(err, "Error running %s info while refreshing state", os.Args[0])
+
+	if output, err := cmd.CombinedOutput(); err != nil {
+		if _, ok := err.(*exec.ExitError); !ok {
+			return errors.Wrapf(err, "Error waiting for info while refreshing state: %s", os.Args[0])
+		}
+		return errors.Wrapf(err, "Error running %s info while refreshing state: %s", os.Args[0], output)
 	}
 	return nil
 }
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 41acd34759..ff39e9e77b 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -277,6 +277,8 @@ reexec_in_user_namespace (int ready)
       _exit (EXIT_FAILURE);
     }
   close (ready);
+  if (b != '1')
+    _exit (EXIT_FAILURE);
 
   if (syscall_setresgid (0, 0, 0) < 0)
     {
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 55fba900e8..933cfa2c20 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -229,6 +229,7 @@ func BecomeRootInUserNS() (bool, int, error) {
 	}
 	defer r.Close()
 	defer w.Close()
+	defer w.Write([]byte("0"))
 
 	pidC := C.reexec_in_user_namespace(C.int(r.Fd()))
 	pid := int(pidC)