merge branch 'pr-1928'

cyphar · cyphar · commit bb522d6ecaf2 · 2018-11-13T16:04:44.000+11:00
rootless: fix potential panic in shouldUseRootlessCgroupManager LGTMs: @crosbymichael @cyphar Closes #1928
diff --git a/rootless_linux.go b/rootless_linux.go
@@ -15,13 +15,14 @@ func shouldUseRootlessCgroupManager(context *cli.Context) (bool, error) {
 		if err != nil {
 			return false, err
 		}
+		// nil b stands for "auto detect"
 		if b != nil {
 			return *b, nil
 		}
-		// nil b stands for "auto detect"
-	}
-	if context.GlobalBool("systemd-cgroup") {
-		return false, nil
+
+		if context.GlobalBool("systemd-cgroup") {
+			return false, nil
+		}
 	}
 	if os.Geteuid() != 0 {
 		return true, nil

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@ func shouldUseRootlessCgroupManager(context *cli.Context) (bool, error) {`
`15`	`15`	`if err != nil {`
`16`	`16`	`return false, err`
`17`	`17`	`}`
	`18`	`+ // nil b stands for "auto detect"`
`18`	`19`	`if b != nil {`
`19`	`20`	`return *b, nil`
`20`	`21`	`}`
`21`		`- // nil b stands for "auto detect"`
`22`		`- }`
`23`		`- if context.GlobalBool("systemd-cgroup") {`
`24`		`- return false, nil`
	`22`	`+`
	`23`	`+ if context.GlobalBool("systemd-cgroup") {`
	`24`	`+ return false, nil`
	`25`	`+ }`
`25`	`26`	`}`
`26`	`27`	`if os.Geteuid() != 0 {`
`27`	`28`	`return true, nil`