mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4599 from evanphx/evanphx/b-logs-hang

Browse Source 
libcontainer: Prevent startup hang when CloseExecFrom errors
This commit is contained in:
Akihiro Suda
2025-01-22 10:18:42 +09:00
committed by GitHub
parent a7d76457f4 7b26da9ee3
commit 8702864454
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/container_linux.go
+11 -10
View File
@@ -324,16 +324,6 @@ func (c *Container) start(process *Process) (retErr error) {
defer process.closeClonedExes()
logsDone := parent.forwardChildLogs()
if logsDone != nil {
defer func() {
// Wait for log forwarder to finish. This depends on
// runc init closing the _LIBCONTAINER_LOGPIPE log fd.
err := <-logsDone
if err != nil && retErr == nil {
retErr = fmt.Errorf("unable to forward init logs: %w", err)
}
}()
}
// Before starting "runc init", mark all non-stdio open files as O_CLOEXEC
// to make sure we don't leak any files into "runc init". Any files to be
@@ -348,6 +338,17 @@ func (c *Container) start(process *Process) (retErr error) {
return fmt.Errorf("unable to start container process: %w", err)
}
if logsDone != nil {
defer func() {
// Wait for log forwarder to finish. This depends on
// runc init closing the _LIBCONTAINER_LOGPIPE log fd.
err := <-logsDone
if err != nil && retErr == nil {
retErr = fmt.Errorf("unable to forward init logs: %w", err)
}
}()
}
if process.Init {
c.fifo.Close()
if c.config.HasHook(configs.Poststart) {