diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-31 09:28:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 09:28:41 -0400 |
| commit | b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b (patch) | |
| tree | f120dd0db970fc02235bf7a92a9fdea9258e84e6 /vendor | |
| parent | eea6bd1cf45746e754e2cceb76f8eb638bcad718 (diff) | |
| parent | c95d2856f86cd8d85284e0b5adf2dd221173c268 (diff) | |
| download | podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.gz podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.tar.bz2 podman-b55a0ce42eb836b8d4a7091ea8bdd82e58f8352b.zip | |
Merge pull request #7166 from vrothberg/2.0-backports
2.0 backports
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 0fdbbb67f..8a6b3cc2d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -467,7 +467,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 |