Skip to content

Commit 48118e8

Browse files
committed
Merge pull request #11487 from stepancheg:nil-cap
PiperOrigin-RevId: 758288714
2 parents ab0097c + 6308502 commit 48118e8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

runsc/cmd/exec.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,10 @@ func argsFromProcess(specProc *specs.Process, p *specs.Process, enableRaw bool)
449449
// auth.TaskCapabilities struct with those capabilities in every capability set.
450450
// This mimics runc's behavior.
451451
func capabilities(p *specs.Process, cs []string, enableRaw bool) (*auth.TaskCapabilities, error) {
452-
specCaps := *p.Capabilities
452+
specCaps := specs.LinuxCapabilities{}
453+
if p.Capabilities != nil {
454+
specCaps = *p.Capabilities
455+
}
453456
for _, cap := range cs {
454457
specCaps.Bounding = append(specCaps.Bounding, cap)
455458
specCaps.Effective = append(specCaps.Effective, cap)

0 commit comments

Comments
 (0)