Skip to content

Commit 034cba6

Browse files
committed
Fixing runc panic for missing file mode
Signed-off-by: rajasec <[email protected]> Fixing runc panic for missing file mode Signed-off-by: rajasec <[email protected]>
1 parent a6284a7 commit 034cba6

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

libcontainer/specconv/spec_linux.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,8 @@ func createDevices(spec *specs.Spec, config *configs.Config) error {
537537
// merge in additional devices from the spec
538538
for _, d := range spec.Linux.Devices {
539539
var uid, gid uint32
540+
var filemode os.FileMode = 0666
541+
540542
if d.UID != nil {
541543
uid = *d.UID
542544
}
@@ -547,12 +549,15 @@ func createDevices(spec *specs.Spec, config *configs.Config) error {
547549
if err != nil {
548550
return err
549551
}
552+
if d.FileMode != nil {
553+
filemode = *d.FileMode
554+
}
550555
device := &configs.Device{
551556
Type: dt,
552557
Path: d.Path,
553558
Major: d.Major,
554559
Minor: d.Minor,
555-
FileMode: *d.FileMode,
560+
FileMode: filemode,
556561
Uid: uid,
557562
Gid: gid,
558563
}

0 commit comments

Comments
 (0)