Merge pull request #11281 from Luap99/3.3-back

[v3.3] backport rootless networking fixes

1 files changed, 9 insertions, 26 deletions

diff --git a/pkg/rootlessport/rootlessport_linux.go b/pkg/rootlessport/rootlessport_linux.go
index ede216bfe..9a2f93f8e 100644
--- a/pkg/rootlessport/rootlessport_linux.go
+++ b/pkg/rootlessport/rootlessport_linux.go
@@ -20,7 +20,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"os/signal"
 	"path/filepath"
 
 	"github.com/containernetworking/plugins/pkg/ns"
@@ -106,30 +105,6 @@ func parent() error {
 		return err
 	}
 
-	exitC := make(chan os.Signal, 1)
-	defer close(exitC)
-
-	go func() {
-		sigC := make(chan os.Signal, 1)
-		signal.Notify(sigC, unix.SIGPIPE)
-		defer func() {
-			signal.Stop(sigC)
-			close(sigC)
-		}()
-
-		select {
-		case s := <-sigC:
-			if s == unix.SIGPIPE {
-				if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil {
-					unix.Dup2(int(f.Fd()), 1) // nolint:errcheck
-					unix.Dup2(int(f.Fd()), 2) // nolint:errcheck
-					f.Close()
-				}
-			}
-		case <-exitC:
-		}
-	}()
-
 	socketDir := filepath.Join(cfg.TmpDir, "rp")
 	err = os.MkdirAll(socketDir, 0700)
 	if err != nil {
@@ -251,8 +226,16 @@ outer:
 		go serve(socket, driver)
 	}
 
-	// write and close ReadyFD (convention is same as slirp4netns --ready-fd)
 	logrus.Info("ready")
+
+	// https://github.com/containers/podman/issues/11248
+	// Copy /dev/null to stdout and stderr to prevent SIGPIPE errors
+	if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil {
+		unix.Dup2(int(f.Fd()), 1) // nolint:errcheck
+		unix.Dup2(int(f.Fd()), 2) // nolint:errcheck
+		f.Close()
+	}
+	// write and close ReadyFD (convention is same as slirp4netns --ready-fd)
 	if _, err := readyW.Write([]byte("1")); err != nil {
 		return err
 	}