Skip to content

Commit 98fe566

Browse files
kolyshkincyphar
authored andcommitted
runc: do not set inheritable capabilities
Do not set inheritable capabilities in runc spec, runc exec --cap, and in libcontainer integration tests. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
1 parent 94105ca commit 98fe566

5 files changed

Lines changed: 0 additions & 40 deletions

File tree

exec.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ func getProcess(context *cli.Context, bundle string) (*specs.Process, error) {
227227
if caps := context.StringSlice("cap"); len(caps) > 0 {
228228
for _, c := range caps {
229229
p.Capabilities.Bounding = append(p.Capabilities.Bounding, c)
230-
p.Capabilities.Inheritable = append(p.Capabilities.Inheritable, c)
231230
p.Capabilities.Effective = append(p.Capabilities.Effective, c)
232231
p.Capabilities.Permitted = append(p.Capabilities.Permitted, c)
233232
p.Capabilities.Ambient = append(p.Capabilities.Ambient, c)

libcontainer/README.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,6 @@ config := &configs.Config{
8484
"CAP_KILL",
8585
"CAP_AUDIT_WRITE",
8686
},
87-
Inheritable: []string{
88-
"CAP_CHOWN",
89-
"CAP_DAC_OVERRIDE",
90-
"CAP_FSETID",
91-
"CAP_FOWNER",
92-
"CAP_MKNOD",
93-
"CAP_NET_RAW",
94-
"CAP_SETGID",
95-
"CAP_SETUID",
96-
"CAP_SETFCAP",
97-
"CAP_SETPCAP",
98-
"CAP_NET_BIND_SERVICE",
99-
"CAP_SYS_CHROOT",
100-
"CAP_KILL",
101-
"CAP_AUDIT_WRITE",
102-
},
10387
Permitted: []string{
10488
"CAP_CHOWN",
10589
"CAP_DAC_OVERRIDE",

libcontainer/integration/exec_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,6 @@ func TestProcessCaps(t *testing.T) {
364364
pconfig.Capabilities.Bounding = append(config.Capabilities.Bounding, "CAP_NET_ADMIN")
365365
pconfig.Capabilities.Permitted = append(config.Capabilities.Permitted, "CAP_NET_ADMIN")
366366
pconfig.Capabilities.Effective = append(config.Capabilities.Effective, "CAP_NET_ADMIN")
367-
pconfig.Capabilities.Inheritable = append(config.Capabilities.Inheritable, "CAP_NET_ADMIN")
368367
err = container.Run(&pconfig)
369368
ok(t, err)
370369

@@ -1360,7 +1359,6 @@ func TestRootfsPropagationSharedMount(t *testing.T) {
13601359
pconfig2.Capabilities.Bounding = append(config.Capabilities.Bounding, "CAP_SYS_ADMIN")
13611360
pconfig2.Capabilities.Permitted = append(config.Capabilities.Permitted, "CAP_SYS_ADMIN")
13621361
pconfig2.Capabilities.Effective = append(config.Capabilities.Effective, "CAP_SYS_ADMIN")
1363-
pconfig2.Capabilities.Inheritable = append(config.Capabilities.Inheritable, "CAP_SYS_ADMIN")
13641362

13651363
err = container.Run(pconfig2)
13661364
_ = stdinR2.Close()

libcontainer/integration/template_test.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,6 @@ func newTemplateConfig(t *testing.T, p *tParam) *configs.Config {
7575
"CAP_KILL",
7676
"CAP_AUDIT_WRITE",
7777
},
78-
Inheritable: []string{
79-
"CAP_CHOWN",
80-
"CAP_DAC_OVERRIDE",
81-
"CAP_FSETID",
82-
"CAP_FOWNER",
83-
"CAP_MKNOD",
84-
"CAP_NET_RAW",
85-
"CAP_SETGID",
86-
"CAP_SETUID",
87-
"CAP_SETFCAP",
88-
"CAP_SETPCAP",
89-
"CAP_NET_BIND_SERVICE",
90-
"CAP_SYS_CHROOT",
91-
"CAP_KILL",
92-
"CAP_AUDIT_WRITE",
93-
},
9478
Ambient: []string{
9579
"CAP_CHOWN",
9680
"CAP_DAC_OVERRIDE",

libcontainer/specconv/example.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ func Example() *specs.Spec {
4141
"CAP_KILL",
4242
"CAP_NET_BIND_SERVICE",
4343
},
44-
Inheritable: []string{
45-
"CAP_AUDIT_WRITE",
46-
"CAP_KILL",
47-
"CAP_NET_BIND_SERVICE",
48-
},
4944
Ambient: []string{
5045
"CAP_AUDIT_WRITE",
5146
"CAP_KILL",

0 commit comments

Comments
 (0)