aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2021-08-10 17:29:29 +0000
committerGitHub <noreply@github.com>2021-08-10 17:29:29 +0000
commit9e9174ebc51ee60678250a74c75de6e18e177414 (patch)
treecbce536f7bd27f1b91003e59f823dc7dd8881aaa /vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
parent859ffb40ae839007ed7fe673312d39177d12244a (diff)
parent4e4c4b62fd3be32a6eb8e5b2dfd7d194c580406f (diff)
downloadpodman-9e9174ebc51ee60678250a74c75de6e18e177414.tar.gz
podman-9e9174ebc51ee60678250a74c75de6e18e177414.tar.bz2
podman-9e9174ebc51ee60678250a74c75de6e18e177414.zip
Merge pull request #11179 from containers/dependabot/go_modules/github.com/opencontainers/selinux-1.8.4
Bump github.com/opencontainers/selinux from 1.8.3 to 1.8.4
Diffstat (limited to 'vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go')
-rw-r--r--vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go12
1 files changed, 2 insertions, 10 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 62df82a34..a804473e4 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
@@ -18,7 +18,6 @@ import (
"sync"
"github.com/bits-and-blooms/bitset"
- "github.com/opencontainers/selinux/pkg/pwalk"
"golang.org/x/sys/unix"
)
@@ -1048,17 +1047,10 @@ func chcon(fpath string, label string, recurse bool) error {
}
if !recurse {
- return SetFileLabel(fpath, label)
+ return setFileLabel(fpath, label)
}
- return pwalk.Walk(fpath, func(p string, info os.FileInfo, err error) error {
- e := SetFileLabel(p, label)
- // Walk a file tree can race with removal, so ignore ENOENT
- if errors.Is(e, os.ErrNotExist) {
- return nil
- }
- return e
- })
+ return rchcon(fpath, label)
}
// dupSecOpt takes an SELinux process label and returns security options that