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 #4953 from rhatdan/selinux

Browse source 
These two patches should fix problems we see with running docker in the wild.
This commit is contained in:
Victor Vieux 2014-04-02 16:36:41 -07:00
commit 9687c087ab
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/label/label.go
View file

@ -21,3 +21,6 @@ func SetFileLabel(path string, fileLabel string) error {
func GetPidCon(pid int) (string, error) {
return "", nil
}
func Init() {
}

4
pkg/label/label_selinux.go
View file

@ -67,3 +67,7 @@ func SetFileLabel(path string, fileLabel string) error {
func GetPidCon(pid int) (string, error) {
return selinux.Getpidcon(pid)
}
func Init() {
selinux.SelinuxEnabled()
}

2
pkg/libcontainer/nsinit/init.go
View file

@ -57,6 +57,8 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
if err := setupNetwork(container, context); err != nil {
return fmt.Errorf("setup networking %s", err)
}
label.Init()
ns.logger.Println("setup mount namespace")
if err := setupNewMountNamespace(rootfs, container.Mounts, console, container.ReadonlyFs, container.NoPivotRoot, container.Context["mount_label"]); err != nil {
return fmt.Errorf("setup mount namespace %s", err)

10
pkg/selinux/selinux.go
View file

@ -313,12 +313,9 @@ func GetLxcContexts() (processLabel string, fileLabel string) {
return "", ""
}
lxcPath := fmt.Sprintf("%s/content/lxc_contexts", GetSELinuxPolicyRoot())
fileLabel = "system_u:object_r:svirt_sandbox_file_t:s0"
processLabel = "system_u:system_r:svirt_lxc_net_t:s0"
in, err := os.Open(lxcPath)
if err != nil {
goto exit
return "", ""
}
defer in.Close()
@ -352,6 +349,11 @@ func GetLxcContexts() (processLabel string, fileLabel string) {
}
}
}
if processLabel == "" || fileLabel == "" {
return "", ""
}
exit:
mcs := IntToMcs(os.Getpid(), 1024)
scon := NewContext(processLabel)