go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3822 from btw616:fix/issue-3821 

PiperOrigin-RevId: 329710371
This commit is contained in:
gVisor bot 2020-09-02 07:42:19 -07:00
parent 563f28b7d5 66ee7c0e98
commit a0e4310384
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runsc/boot/loader.go
View File

@ -689,9 +689,18 @@ func (l *Loader) startContainer(spec *specs.Spec, conf *config.Config, cid strin
return fmt.Errorf("creating new process: %v", err)
}
// setupContainerFS() dups stdioFDs, so we don't need to dup them here.
// VFS1 dups stdioFDs, so we don't need to dup them here. VFS2 takes
// ownership of the passed FDs, and we need to dup them here.
for _, f := range files[:3] {
info.stdioFDs = append(info.stdioFDs, int(f.Fd()))
if !kernel.VFS2Enabled {
info.stdioFDs = append(info.stdioFDs, int(f.Fd()))
} else {
fd, err := unix.Dup(int(f.Fd()))
if err != nil {
return fmt.Errorf("failed to dup file: %v", err)
}
info.stdioFDs = append(info.stdioFDs, fd)
}
}
// Can't take ownership away from os.File. dup them to get a new FDs.