Merge pull request #6036 from giuseppe/fix-rootlessport-panic

rootlessport: use two different channels

pkg/rootlessport/rootlessport_linux.go

@@ -102,19 +102,19 @@ 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() {
-		// dummy signal to terminate the goroutine
-		sigC <- unix.SIGKILL
-	}()
-	go func() {
 		defer func() {
 			signal.Stop(sigC)
 			close(sigC)
 		}()
 
-		s := <-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
@@ -122,6 +122,8 @@ func parent() error {
 					f.Close()
 				}
 			}
+		case <-exitC:
+		}
 	}()
 
 	// create the parent driver

pkg/specgen/namespaces.go

@@ -216,6 +216,8 @@ func ParseNetworkNamespace(ns string) (Namespace, []string, error) {
 	toReturn := Namespace{}
 	var cniNetworks []string
 	switch {
+	case ns == "slirp4netns":
+		toReturn.NSMode = Slirp
 	case ns == "pod":
 		toReturn.NSMode = FromPod
 	case ns == "bridge":