summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorJonathan Dieter <jonathan.dieter@spearline.com>2020-08-11 15:47:32 +0100
committerJonathan Dieter <jonathan.dieter@spearline.com>2020-08-15 16:34:58 +0100
commit0cd2f2d974789b82ad8e5471963df45211dafaea (patch)
tree8b636441f494f67afc1097afb39f3c0dbb39b30e /pkg
parentca4423e94d28c9e5e59ccb958564b9d6ad5bd0fc (diff)
downloadpodman-0cd2f2d974789b82ad8e5471963df45211dafaea.tar.gz
podman-0cd2f2d974789b82ad8e5471963df45211dafaea.tar.bz2
podman-0cd2f2d974789b82ad8e5471963df45211dafaea.zip
Wait for reexec to finish when fileOutput is nil
Currently, we're not cleanup up after ourselves when fileOutput is nil. This patch fixes that. Signed-off-by: Jonathan Dieter <jonathan.dieter@spearline.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/rootless/rootless_linux.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index ecd309d36..bbd797817 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -233,6 +233,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
if pid < 0 {
return false, -1, errors.Errorf("cannot re-exec process")
}
+ defer func() {
+ if retErr != nil {
+ C.reexec_in_user_namespace_wait(pidC, 0)
+ }
+ }()
uids, gids, err := GetConfiguredMappings()
if err != nil {
@@ -294,6 +299,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
}
if fileOutput != nil {
+ ret := C.reexec_in_user_namespace_wait(pidC, 0)
+ if ret < 0 {
+ return false, -1, errors.New("error waiting for the re-exec process")
+ }
+
return true, 0, nil
}