Skip to content

Commit aafa809

Browse files
committed
do not set the inheritable capabilities
The kernel never sets the inheritable capabilities for a process, they are only set by userspace. Emulate the same behavior. Closes: CVE-2022-27649 Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent c39dffe commit aafa809

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

libpod/oci_conmon_exec_linux.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,14 @@ func prepareProcessExec(c *Container, options *ExecOptions, env []string, sessio
758758
} else {
759759
pspec.Capabilities.Bounding = ctrSpec.Process.Capabilities.Bounding
760760
}
761+
762+
// Always unset the inheritable capabilities similarly to what the Linux kernel does
763+
// They are used only when using capabilities with uid != 0.
764+
pspec.Capabilities.Inheritable = []string{}
765+
761766
if execUser.Uid == 0 {
762767
pspec.Capabilities.Effective = pspec.Capabilities.Bounding
763-
pspec.Capabilities.Inheritable = pspec.Capabilities.Bounding
764768
pspec.Capabilities.Permitted = pspec.Capabilities.Bounding
765-
pspec.Capabilities.Ambient = pspec.Capabilities.Bounding
766769
} else {
767770
if user == c.config.User {
768771
pspec.Capabilities.Effective = ctrSpec.Process.Capabilities.Effective

pkg/specgen/generate/security.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,17 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator,
146146

147147
configSpec := g.Config
148148
configSpec.Process.Capabilities.Ambient = []string{}
149+
150+
// Always unset the inheritable capabilities similarly to what the Linux kernel does
151+
// They are used only when using capabilities with uid != 0.
152+
configSpec.Process.Capabilities.Inheritable = []string{}
149153
configSpec.Process.Capabilities.Bounding = caplist
150154

151155
user := strings.Split(s.User, ":")[0]
152156

153157
if (user == "" && s.UserNS.NSMode != specgen.KeepID) || user == "root" || user == "0" {
154158
configSpec.Process.Capabilities.Effective = caplist
155159
configSpec.Process.Capabilities.Permitted = caplist
156-
configSpec.Process.Capabilities.Inheritable = caplist
157160
} else {
158161
mergedCaps, err := capabilities.MergeCapabilities(nil, s.CapAdd, nil)
159162
if err != nil {
@@ -175,12 +178,12 @@ func securityConfigureGenerator(s *specgen.SpecGenerator, g *generate.Generator,
175178
}
176179
configSpec.Process.Capabilities.Effective = userCaps
177180
configSpec.Process.Capabilities.Permitted = userCaps
178-
configSpec.Process.Capabilities.Inheritable = userCaps
179181

180182
// Ambient capabilities were added to Linux 4.3. Set ambient
181183
// capabilities only when the kernel supports them.
182184
if supportAmbientCapabilities() {
183185
configSpec.Process.Capabilities.Ambient = userCaps
186+
configSpec.Process.Capabilities.Inheritable = userCaps
184187
}
185188
}
186189

test/e2e/run_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ var _ = Describe("Podman run", func() {
498498
session = podmanTest.Podman([]string{"run", "--rm", "--user", "root", ALPINE, "grep", "CapInh", "/proc/self/status"})
499499
session.WaitWithDefaultTimeout()
500500
Expect(session).Should(Exit(0))
501-
Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb"))
501+
Expect(session.OutputToString()).To(ContainSubstring("0000000000000000"))
502502

503503
session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "grep", "CapBnd", "/proc/self/status"})
504504
session.WaitWithDefaultTimeout()
@@ -533,7 +533,7 @@ var _ = Describe("Podman run", func() {
533533
session = podmanTest.Podman([]string{"run", "--user=0:0", "--cap-add=DAC_OVERRIDE", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"})
534534
session.WaitWithDefaultTimeout()
535535
Expect(session).Should(Exit(0))
536-
Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb"))
536+
Expect(session.OutputToString()).To(ContainSubstring("0000000000000000"))
537537

538538
if os.Geteuid() > 0 {
539539
if os.Getenv("SKIP_USERNS") != "" {
@@ -550,7 +550,7 @@ var _ = Describe("Podman run", func() {
550550
session = podmanTest.Podman([]string{"run", "--userns=keep-id", "--privileged", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"})
551551
session.WaitWithDefaultTimeout()
552552
Expect(session).Should(Exit(0))
553-
Expect(session.OutputToString()).To(ContainSubstring("0000000000000000"))
553+
Expect(session.OutputToString()).To(ContainSubstring("0000000000000002"))
554554

555555
session = podmanTest.Podman([]string{"run", "--userns=keep-id", "--cap-add=DAC_OVERRIDE", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"})
556556
session.WaitWithDefaultTimeout()

0 commit comments

Comments
 (0)