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

Merge pull request #4319 from lifubang/fix-execfifo-delete-error

Browse Source 
Try to delete exec fifo file when failure in creation
This commit is contained in:
Kir Kolyshkin
2024-06-26 11:53:34 -07:00
committed by GitHub
parent 213fefd25d e7294527e2
commit ab010ae1ef
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/container_linux.go
+6 -1
View File
@@ -411,7 +411,7 @@ func (c *Container) Signal(s os.Signal) error {
return nil
}
func (c *Container) createExecFifo() error {
func (c *Container) createExecFifo() (retErr error) {
rootuid, err := c.Config().HostRootUID()
if err != nil {
return err
@@ -425,6 +425,11 @@ func (c *Container) createExecFifo() error {
if err := unix.Mkfifo(fifoName, 0o622); err != nil {
return &os.PathError{Op: "mkfifo", Path: fifoName, Err: err}
}
defer func() {
if retErr != nil {
os.Remove(fifoName)
}
}()
// Ensure permission bits (can be different because of umask).
if err := os.Chmod(fifoName, 0o622); err != nil {
return err