summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2020-07-28 16:35:05 +0900
committerAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2020-07-28 16:35:05 +0900
commit3c333e7a93fbc08fed0ad317cae92d75105a8210 (patch)
treeea0f5a1ca98beea6ef1c1294c65b13632f3d2a4a /vendor
parent2b7bc9b101887a789a9fc0282d448efad824404f (diff)
downloadpodman-3c333e7a93fbc08fed0ad317cae92d75105a8210.tar.gz
podman-3c333e7a93fbc08fed0ad317cae92d75105a8210.tar.bz2
podman-3c333e7a93fbc08fed0ad317cae92d75105a8210.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.go2
-rw-r--r--vendor/modules.txt2
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