summaryrefslogtreecommitdiff
path: root/vendor/github.com/opencontainers/selinux
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-11-20 18:09:23 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-11-28 10:51:37 +0100
commitc4a592b632957513cae2a728a1b9f665827595d8 (patch)
treefa5af31750eae58c47213f55fdb831a064f83422 /vendor/github.com/opencontainers/selinux
parent6df7409cb5a41c710164c42ed35e33b28f3f7214 (diff)
downloadpodman-c4a592b632957513cae2a728a1b9f665827595d8.tar.gz
podman-c4a592b632957513cae2a728a1b9f665827595d8.tar.bz2
podman-c4a592b632957513cae2a728a1b9f665827595d8.zip
vendor: update selinux
inherit a change for not failing a recursive relabelling if the file is removed between the directory is read and the lsetxattr syscall. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'vendor/github.com/opencontainers/selinux')
-rw-r--r--vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go6
1 files changed, 5 insertions, 1 deletions
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 2cd54eac1..bbaa1e0d7 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
@@ -687,7 +687,11 @@ func Chcon(fpath string, label string, recurse bool) error {
return err
}
callback := func(p string, info os.FileInfo, err error) error {
- return SetFileLabel(p, label)
+ e := SetFileLabel(p, label)
+ if os.IsNotExist(e) {
+ return nil
+ }
+ return e
}
if recurse {