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

Try to delete exec fifo file when failure in creation
opencontainers · Jun 26, 2024 · ab010ae · ab010ae
2 parents 213fefd + e729452
commit ab010ae
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -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