From 5e7d59fc9dc23c6a6c11e1158fb9bb4009d69ad4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 3 Apr 2019 22:01:39 +0200 Subject: [PATCH] bump opencontainers/selinux v1.2.1 full diff: opencontainers/selinux@v1.2...v1.2.1 brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- .../opencontainers/selinux/go-selinux/selinux_linux.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor.conf b/vendor.conf index 2f3c405d6..439724bae 100644 --- a/vendor.conf +++ b/vendor.conf @@ -36,7 +36,7 @@ github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7 github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runc 12f6a991201fdb8f82579582d5e00e28fba06d0a github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353 -github.com/opencontainers/selinux v1.2 +github.com/opencontainers/selinux v1.2.1 github.com/pkg/errors v0.8.0 github.com/pmezard/go-difflib v1.0.0 github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823 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 1f50440c0..51fa8de68 100644 --- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go +++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go @@ -333,6 +333,11 @@ func writeCon(fpath string, val string) error { if fpath == "" { return ErrEmptyPath } + if val == "" { + if !GetEnabled() { + return nil + } + } out, err := os.OpenFile(fpath, os.O_WRONLY, 0) if err != nil {