Merge pull request #1312 from runcom/fix-selinux-labels

Mrunal Patel · web-flow · commit b263a43430ac · 2017-02-06T10:33:42.000-08:00
libcontainer: selinux: fix DupSecOpt and DisableSecOpt
diff --git a/libcontainer/selinux/selinux.go b/libcontainer/selinux/selinux.go
@@ -536,14 +536,14 @@ func DupSecOpt(src string) []string {
 		con["level"] == "" {
 		return nil
 	}
-	return []string{"label=user:" + con["user"],
-		"label=role:" + con["role"],
-		"label=type:" + con["type"],
-		"label=level:" + con["level"]}
+	return []string{"user:" + con["user"],
+		"role:" + con["role"],
+		"type:" + con["type"],
+		"level:" + con["level"]}
 }
 
 // DisableSecOpt returns a security opt that can be used to disabling SELinux
 // labeling support for future container processes
 func DisableSecOpt() []string {
-	return []string{"label=disable"}
+	return []string{"disable"}
 }

Original file line number	Diff line number	Diff line change
`@@ -536,14 +536,14 @@ func DupSecOpt(src string) []string {`
`536`	`536`	`con["level"] == "" {`
`537`	`537`	`return nil`
`538`	`538`	`}`
`539`		`- return []string{"label=user:" + con["user"],`
`540`		`- "label=role:" + con["role"],`
`541`		`- "label=type:" + con["type"],`
`542`		`- "label=level:" + con["level"]}`
	`539`	`+ return []string{"user:" + con["user"],`
	`540`	`+ "role:" + con["role"],`
	`541`	`+ "type:" + con["type"],`
	`542`	`+ "level:" + con["level"]}`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`// DisableSecOpt returns a security opt that can be used to disabling SELinux`
`546`	`546`	`// labeling support for future container processes`
`547`	`547`	`func DisableSecOpt() []string {`
`548`		`- return []string{"label=disable"}`
	`548`	`+ return []string{"disable"}`
`549`	`549`	`}`