Merge pull request #9548 from mheon/fix_1930552

rhatdan · web-flow · commit bcbbbc433e74 · 2021-03-01T10:22:35.000-05:00
[v1.6.4-rhel] Fix RHBZ#1930552
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
@@ -1107,7 +1107,7 @@ func prepareProcessExec(c *Container, cmd, env []string, tty bool, cwd, user, se
 	pspec.Capabilities.Effective = []string{}
 	if privileged {
 		pspec.Capabilities.Bounding = allCaps
-	} else {
+	} else if execUser.Uid != 0 {
 		pspec.Capabilities.Bounding = []string{}
 	}
 	pspec.Capabilities.Inheritable = pspec.Capabilities.Bounding

Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ func prepareProcessExec(c *Container, cmd, env []string, tty bool, cwd, user, se`
`1107`	`1107`	`pspec.Capabilities.Effective = []string{}`
`1108`	`1108`	`if privileged {`
`1109`	`1109`	`pspec.Capabilities.Bounding = allCaps`
`1110`		`- } else {`
	`1110`	`+ } else if execUser.Uid != 0 {`
`1111`	`1111`	`pspec.Capabilities.Bounding = []string{}`
`1112`	`1112`	`}`
`1113`	`1113`	`pspec.Capabilities.Inheritable = pspec.Capabilities.Bounding`