summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-14 20:49:45 +0100
committerGitHub <noreply@github.com>2020-02-14 20:49:45 +0100
commit3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e (patch)
tree7692f22e349a87af7067b6aedc1d6029ea25f501 /libpod
parent7e713ff336b8dd48b6fd75b16c92e6a35579355d (diff)
parentb4fa6f4f0819bcc0b85a5215564b937c374f315c (diff)
downloadpodman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.tar.gz
podman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.tar.bz2
podman-3e0088ce7cf8063cf0f1a3922acaddb2cf43fe8e.zip
Merge pull request #5207 from rhatdan/selinux
Fix SELinux labels of volumes
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_volume_linux.go2
-rw-r--r--libpod/util_linux.go13
2 files changed, 8 insertions, 7 deletions
diff --git a/libpod/runtime_volume_linux.go b/libpod/runtime_volume_linux.go
index e1f3480ce..037cf4cc2 100644
--- a/libpod/runtime_volume_linux.go
+++ b/libpod/runtime_volume_linux.go
@@ -85,7 +85,7 @@ func (r *Runtime) newVolume(ctx context.Context, options ...VolumeCreateOption)
if err := os.Chown(fullVolPath, volume.config.UID, volume.config.GID); err != nil {
return nil, errors.Wrapf(err, "error chowning volume directory %q to %d:%d", fullVolPath, volume.config.UID, volume.config.GID)
}
- if err := LabelVolumePath(fullVolPath, true); err != nil {
+ if err := LabelVolumePath(fullVolPath); err != nil {
return nil, err
}
volume.config.MountPoint = fullVolPath
diff --git a/libpod/util_linux.go b/libpod/util_linux.go
index 631f6836c..f0b4028de 100644
--- a/libpod/util_linux.go
+++ b/libpod/util_linux.go
@@ -92,7 +92,7 @@ func assembleSystemdCgroupName(baseSlice, newSlice string) (string, error) {
// LabelVolumePath takes a mount path for a volume and gives it an
// selinux label of either shared or not
-func LabelVolumePath(path string, shared bool) error {
+func LabelVolumePath(path string) error {
_, mountLabel, err := label.InitLabels([]string{})
if err != nil {
return errors.Wrapf(err, "error getting default mountlabels")
@@ -100,12 +100,13 @@ func LabelVolumePath(path string, shared bool) error {
if err := label.ReleaseLabel(mountLabel); err != nil {
return errors.Wrapf(err, "error releasing label %q", mountLabel)
}
- if err := label.Relabel(path, mountLabel, shared); err != nil {
- permString := "private"
- if shared {
- permString = "shared"
+
+ if err := label.Relabel(path, mountLabel, true); err != nil {
+ if err != syscall.ENOTSUP {
+ logrus.Debugf("Labeling not supported on %q", path)
+ } else {
+ return errors.Wrapf(err, "error setting selinux label for %s to %q as shared", path, mountLabel)
}
- return errors.Wrapf(err, "error setting selinux label for %s to %q as %s", path, mountLabel, permString)
}
return nil
}