diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-11-02 14:26:30 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-11-02 14:36:39 +0100 |
| commit | bce8f851c1e891aa6159e61c56ccd712b60c31b7 (patch) | |
| tree | 09931f52e6af1aceea6c1221b10949df8be45dc6 /pkg | |
| parent | c1ffdfbd7883d45f864c74a4a07cf9ff80b4018f (diff) | |
| download | podman-bce8f851c1e891aa6159e61c56ccd712b60c31b7.tar.gz podman-bce8f851c1e891aa6159e61c56ccd712b60c31b7.tar.bz2 podman-bce8f851c1e891aa6159e61c56ccd712b60c31b7.zip | |
specgen: add support for ambient capabilities
if the kernel supports ambient capabilities (Linux 4.3+), also set
them when running with euid != 0.
This is different that what Moby does, as ambient capabilities are
never set.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/config_linux.go | 5 | ||||
| -rw-r--r-- | pkg/specgen/generate/security.go | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index fcb7641d2..2d40dba8f 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -350,3 +350,8 @@ func deviceFromPath(path string) (*spec.LinuxDevice, error) { Minor: int64(unix.Minor(devNumber)), }, nil } + +func supportAmbientCapabilities() bool { + err := unix.Prctl(unix.PR_CAP_AMBIENT, unix.PR_CAP_AMBIENT_IS_SET, 0, 0, 0) + return err == nil +} diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go index d17cd4a9a..8a9fd7a41 100644 --- a/pkg/specgen/generate/security.go +++ b/pkg/specgen/generate/security.go @@ -145,6 +145,12 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator, } configSpec.Process.Capabilities.Effective = userCaps configSpec.Process.Capabilities.Permitted = 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 + } } g.SetProcessNoNewPrivileges(s.NoNewPrivileges) |