diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 14:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 14:56:10 +0200 |
| commit | ecd84781d8b8d28b5f3920aa906a87ec48345f7d (patch) | |
| tree | ca09f54ac99f9f96a290cd0dd1f676b756ec5064 /vendor | |
| parent | 91c92d10fc64af7e7813ba46f8eae8a8e7db44de (diff) | |
| parent | 3c333e7a93fbc08fed0ad317cae92d75105a8210 (diff) | |
| download | podman-ecd84781d8b8d28b5f3920aa906a87ec48345f7d.tar.gz podman-ecd84781d8b8d28b5f3920aa906a87ec48345f7d.tar.bz2 podman-ecd84781d8b8d28b5f3920aa906a87ec48345f7d.zip | |
Merge pull request #7101 from AkihiroSuda/rootlesskit-010
Bump github.com/rootless-containers/rootlesskit from 0.9.5 to 0.10.0
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go index 7cce235a6..112a926c3 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/child/child.go @@ -119,11 +119,13 @@ func (d *childDriver) handleConnectRequest(c *net.UnixConn, req *msg.Request) er if err != nil { return err } + defer targetConnFile.Close() oob := unix.UnixRights(int(targetConnFile.Fd())) f, err := c.File() if err != nil { return err } + defer f.Close() for { err = unix.Sendmsg(int(f.Fd()), []byte("dummy"), oob, nil, 0) if err != unix.EINTR { diff --git a/vendor/modules.txt b/vendor/modules.txt index 7cd0f86df..1c1865e23 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -468,7 +468,7 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/rootless-containers/rootlesskit v0.9.5 +# github.com/rootless-containers/rootlesskit v0.10.0 github.com/rootless-containers/rootlesskit/pkg/msgutil github.com/rootless-containers/rootlesskit/pkg/port github.com/rootless-containers/rootlesskit/pkg/port/builtin |