opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-05 21:32:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5534 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.9.2

Browse Source 
Bump github.com/rootless-containers/rootlesskit from 0.8.0 to 0.9.2
This commit is contained in:
OpenShift Merge Robot
2020-03-25 17:23:48 +01:00
committed by GitHub
parent 852dd7fbde e8e590ed88
commit ff0124aee1
145 changed files with 19332 additions and 89468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go generated vendored
View File

@@ -124,7 +124,12 @@ func (d *childDriver) handleConnectRequest(c *net.UnixConn, req *msg.Request) er
if err != nil {
return err
}
err = unix.Sendmsg(int(f.Fd()), []byte("dummy"), oob, nil, 0)
for {
err = unix.Sendmsg(int(f.Fd()), []byte("dummy"), oob, nil, 0)
if err != unix.EINTR {
break
}
}
return err
}

11
vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/msg/msg.go generated vendored
View File

@@ -62,7 +62,16 @@ func ConnectToChild(c *net.UnixConn, spec port.Spec) (int, error) {
}
oobSpace := unix.CmsgSpace(4)
oob := make([]byte, oobSpace)
_, oobN, _, _, err := c.ReadMsgUnix(nil, oob)
var (
oobN int
err error
)
for {
_, oobN, _, _, err = c.ReadMsgUnix(nil, oob)
if err != unix.EINTR {
break
}
}
if err != nil {
return 0, err
}