diff options
| author | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-07-28 16:35:05 +0900 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-07-31 13:01:47 +0200 |
| commit | 806d0ab865ebc0747f86a26ab53c8183c251192a (patch) | |
| tree | efb829e729eff4926948d7068be84885f8f165a2 /vendor | |
| parent | cae345331635ae57aff99327d5a9bfdfdf0c3a5b (diff) | |
| download | podman-806d0ab865ebc0747f86a26ab53c8183c251192a.tar.gz podman-806d0ab865ebc0747f86a26ab53c8183c251192a.tar.bz2 podman-806d0ab865ebc0747f86a26ab53c8183c251192a.zip | |
Bump github.com/rootless-containers/rootlesskit from 0.9.5 to 0.10.0
Fix #7016 via https://github.com/rootless-containers/rootlesskit/pull/157
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
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 |