diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-30 11:13:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 11:13:19 -0400 |
| commit | 0a839a59ec43ae03c522a1b82224605219256ab1 (patch) | |
| tree | d88cc6fb228c89301a837d1b4501aed34d1cb69b /pkg | |
| parent | 05f083461047d0b5425e22334e8259038a51492e (diff) | |
| parent | e7b7fcbd8a8bfc71ce4d038fe50fee59ac26ca45 (diff) | |
| download | podman-0a839a59ec43ae03c522a1b82224605219256ab1.tar.gz podman-0a839a59ec43ae03c522a1b82224605219256ab1.tar.bz2 podman-0a839a59ec43ae03c522a1b82224605219256ab1.zip | |
Merge pull request #13694 from giuseppe/v4.0-backport-no-inheritable
[4.0] do not set the inheritable capabilities
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/security.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go index 9c6709905..988c29832 100644 --- a/pkg/specgen/generate/security.go +++ b/pkg/specgen/generate/security.go @@ -146,6 +146,10 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, configSpec := g.Config configSpec.Process.Capabilities.Ambient = []string{} + + // Always unset the inheritable capabilities similarly to what the Linux kernel does + // They are used only when using capabilities with uid != 0. + configSpec.Process.Capabilities.Inheritable = []string{} configSpec.Process.Capabilities.Bounding = caplist user := strings.Split(s.User, ":")[0] @@ -153,7 +157,6 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, if (user == "" && s.UserNS.NSMode != specgen.KeepID) || user == "root" || user == "0" { configSpec.Process.Capabilities.Effective = caplist configSpec.Process.Capabilities.Permitted = caplist - configSpec.Process.Capabilities.Inheritable = caplist } else { mergedCaps, err := capabilities.MergeCapabilities(nil, s.CapAdd, nil) if err != nil { @@ -175,12 +178,12 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, } configSpec.Process.Capabilities.Effective = userCaps configSpec.Process.Capabilities.Permitted = userCaps - configSpec.Process.Capabilities.Inheritable = userCaps // Ambient capabilities were added to Linux 4.3. Set ambient // capabilities only when the kernel supports them. if supportAmbientCapabilities() { configSpec.Process.Capabilities.Ambient = userCaps + configSpec.Process.Capabilities.Inheritable = userCaps } } |