opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-14 10:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from spearlineltd/cleanupzombie

Browse Source 
Wait for reexec to finish when fileOutput is nil
This commit is contained in:
OpenShift Merge Robot
2020-08-18 13:14:48 +02:00
committed by GitHub
parent 8caed30574 0cd2f2d974
commit 49d6468b93
1 changed files with 10 additions and 0 deletions

10
pkg/rootless/rootless_linux.go

@ -233,6 +233,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
if pid < 0 { if pid < 0 {
return false, -1, errors.Errorf("cannot re-exec process") 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() uids, gids, err := GetConfiguredMappings()
if err != nil { if err != nil {
@ -294,6 +299,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
} }
if fileOutput != nil { 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 return true, 0, nil
} }