toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SELinux errors caused by multi-threading

Browse Source 
Occasionally the selinux_test program will fail because we are setting file
context based on the Process ID but not the TID.  THis change will always
use the TID to set SELinux labels.

Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: crosbymichael)
Upstream-commit: 12934ef3a40d814cb307dfea0cc86124ec997593
Component: engine
This commit is contained in:
Dan Walsh
2014-04-29 03:40:05 -07:00
committed by Michael Crosby
parent a5f91ab172
commit 58dae079fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/pkg/selinux/selinux.go
+3 -3
View File
@@ -146,15 +146,15 @@ func Setfilecon(path string, scon string) error {
}
func Setfscreatecon(scon string) error {
return writeCon("/proc/self/attr/fscreate", scon)
return writeCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", system.Gettid()), scon)
}
func Getfscreatecon() (string, error) {
return readCon("/proc/self/attr/fscreate")
return readCon(fmt.Sprintf("/proc/self/task/%d/attr/fscreate", system.Gettid()))
}
func getcon() (string, error) {
return readCon("/proc/self/attr/current")
return readCon(fmt.Sprintf("/proc/self/task/%d/attr/current", system.Gettid()))
}
func Getpidcon(pid int) (string, error) {