kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #40945 from thaJeztah/fix_selinux_enotsup

Browse source 
SELinux: fix ENOTSUP errors not being detected when relabeling
This commit is contained in:
Brian Goff 2020-05-11 08:24:16 -07:00 committed by GitHub
commit a93e9eb0e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
container/container_unix.go
View file

@ -20,7 +20,6 @@ import (
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
) )
const ( const (
@ -147,7 +146,7 @@ func (container *Container) CopyImagePathContent(v volume.Volume, destination st
logrus.Warnf("error while unmounting volume %s: %v", v.Name(), err) logrus.Warnf("error while unmounting volume %s: %v", v.Name(), err)
} }
}() }()
if err := label.Relabel(path, container.MountLabel, true); err != nil && err != unix.ENOTSUP { if err := label.Relabel(path, container.MountLabel, true); err != nil && !errors.Is(err, syscall.ENOTSUP) {
return err return err
} }
return copyExistingContents(rootfs, path) return copyExistingContents(rootfs, path)

2
volume/mounts/mounts.go
View file

@ -113,7 +113,7 @@ func (m *MountPoint) Setup(mountLabel string, rootIDs idtools.Identity, checkFun
return return
} }
err = label.Relabel(sourcePath, mountLabel, label.IsShared(m.Mode)) err = label.Relabel(sourcePath, mountLabel, label.IsShared(m.Mode))
if err == syscall.ENOTSUP { if errors.Is(err, syscall.ENOTSUP) {
err = nil err = nil
} }
if err != nil { if err != nil {