netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

runsc: fix pid file race condition in exec detach mode.

Browse Source 
PiperOrigin-RevId: 214700295
Change-Id: I73d8490572eebe5da584af91914650d1953aeb91
This commit is contained in:
Lantao Liu
2018-09-26 17:41:20 -07:00
committed by Shentubot
parent 539df2940d
commit a003e041c8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/cmd/exec.go
+7 -3
View File
@@ -247,10 +247,14 @@ func (ex *Exec) execAndWait(waitStatus *syscall.WaitStatus) subcommands.ExitStat
// '--process' file is deleted as soon as this process returns and the child
// may fail to read it.
ready := func() (bool, error) {
_, err := os.Stat(pidFile)
pidb, err := ioutil.ReadFile(pidFile)
if err == nil {
// File appeared, we're done!
return true, nil
// File appeared, check whether pid is fully written.
pid, err := strconv.Atoi(string(pidb))
if err != nil {
return false, nil
}
return pid == cmd.Process.Pid, nil
}
if pe, ok := err.(*os.PathError); !ok || pe.Err != syscall.ENOENT {
return false, err