opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
rootlessport: use two different channels
This commit is contained in:
OpenShift Merge Robot
2020-04-29 16:07:44 +02:00
committed by GitHub
parent de77e4b3f1 6d545bb2f7
commit 6246165f16
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/rootlessport/rootlessport_linux.go
View File

@ -102,25 +102,27 @@ func parent() error {
return err return err
} }
sigC := make(chan os.Signal, 1) exitC := make(chan os.Signal, 1)
signal.Notify(sigC, unix.SIGPIPE) defer close(exitC)
defer func() {
// dummy signal to terminate the goroutine
sigC <- unix.SIGKILL
}()
go func() { go func() {
sigC := make(chan os.Signal, 1)
signal.Notify(sigC, unix.SIGPIPE)
defer func() { defer func() {
signal.Stop(sigC) signal.Stop(sigC)
close(sigC) close(sigC)
}() }()
s := <-sigC select {
if s == unix.SIGPIPE { case s := <-sigC:
if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil { if s == unix.SIGPIPE {
unix.Dup2(int(f.Fd()), 1) // nolint:errcheck if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil {
unix.Dup2(int(f.Fd()), 2) // nolint:errcheck unix.Dup2(int(f.Fd()), 1) // nolint:errcheck
f.Close() unix.Dup2(int(f.Fd()), 2) // nolint:errcheck
f.Close()
}
} }
case <-exitC:
} }
}() }()

2
pkg/specgen/namespaces.go
View File

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