mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-10 21:53:57 +08:00
[1.4] libct: startInitialization: add defer close
This function calls Init what normally never returns, so the defer only
works if there is an error and we can safely use it to close those fds
we opened. This was done for most but not all fds.
Reported in issue 5008.
Reported-by: Arina Cherednik <arinacherednik034@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 88f897160c)
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
committed by
Aleksa Sarai
parent
6b36291fd5
commit
ffc6092b8d
@@ -175,6 +175,7 @@ func startInitialization() (retErr error) {
|
||||
return fmt.Errorf("unable to convert _LIBCONTAINER_LOGPIPE: %w", err)
|
||||
}
|
||||
logPipe := os.NewFile(uintptr(logFd), "logpipe")
|
||||
defer logPipe.Close()
|
||||
|
||||
logrus.SetOutput(logPipe)
|
||||
logrus.SetFormatter(new(logrus.JSONFormatter))
|
||||
@@ -190,6 +191,7 @@ func startInitialization() (retErr error) {
|
||||
return fmt.Errorf("unable to convert _LIBCONTAINER_FIFOFD: %w", err)
|
||||
}
|
||||
fifoFile = os.NewFile(uintptr(fifoFd), "initfifo")
|
||||
defer fifoFile.Close()
|
||||
}
|
||||
|
||||
var consoleSocket *os.File
|
||||
|
||||
Reference in New Issue
Block a user