From 12c7541f1f2d616967f9eecce182789de7e2a238 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 20 Feb 2020 14:40:25 +0100 Subject: [PATCH] vendor: update opencontainers/selinux v1.3.1 full diff: https://github.com/opencontainers/selinux/compare/5215b1806f52b1fcc2070a8826c542c9d33cd3cf...v1.3.1 Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- .../selinux/go-selinux/selinux_linux.go | 12 +++++++++--- vendor/github.com/opencontainers/selinux/go.mod | 8 ++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 vendor/github.com/opencontainers/selinux/go.mod diff --git a/vendor.conf b/vendor.conf index fe5414ba1a..cfb54771e4 100644 --- a/vendor.conf +++ b/vendor.conf @@ -161,6 +161,6 @@ github.com/morikuni/aec 39771216ff4c63d11f5e604076f9 # metrics github.com/docker/go-metrics b619b3592b65de4f087d9f16863a7e6ff905973c # v0.0.1 -github.com/opencontainers/selinux 5215b1806f52b1fcc2070a8826c542c9d33cd3cf +github.com/opencontainers/selinux 4defb1c884d2f4f9c890c615380f20f7fc215cf3 # v1.3.1 # DO NOT EDIT BELOW THIS LINE -------- reserved for downstream projects -------- diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go index 8cdf1b054a..9fcfd0867d 100644 --- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go +++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go @@ -7,7 +7,6 @@ import ( "bytes" "crypto/rand" "encoding/binary" - "errors" "fmt" "io" "io/ioutil" @@ -19,6 +18,7 @@ import ( "sync" "syscall" + "github.com/pkg/errors" "golang.org/x/sys/unix" ) @@ -289,7 +289,10 @@ func SetFileLabel(fpath string, label string) error { if fpath == "" { return ErrEmptyPath } - return lsetxattr(fpath, xattrNameSelinux, []byte(label), 0) + if err := lsetxattr(fpath, xattrNameSelinux, []byte(label), 0); err != nil { + return errors.Wrapf(err, "failed to set file label on %s", fpath) + } + return nil } // FileLabel returns the SELinux label for this path or returns an error. @@ -370,7 +373,10 @@ func writeCon(fpath string, val string) error { } else { _, err = out.Write(nil) } - return err + if err != nil { + return errors.Wrapf(err, "failed to set %s on procfs", fpath) + } + return nil } /* diff --git a/vendor/github.com/opencontainers/selinux/go.mod b/vendor/github.com/opencontainers/selinux/go.mod new file mode 100644 index 0000000000..eb4053ee5b --- /dev/null +++ b/vendor/github.com/opencontainers/selinux/go.mod @@ -0,0 +1,8 @@ +module github.com/opencontainers/selinux + +go 1.13 + +require ( + github.com/pkg/errors v0.8.1 + golang.org/x/sys v0.0.0-20191115151921-52ab43148777 +)