Merge pull request opencontainers#1824 from cyphar/fix-mips-build-dev…

…Number libcontainer: devices: fix mips builds
kolyshkin · Jun 25, 2018 · 2c632d1 · 2c632d1
2 parents eff9297 + a0e99e7
commit 2c632d1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libcontainer/devices/devices.go b/libcontainer/devices/devices.go
@@ -30,8 +30,9 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) {
 	}
 
 	var (
-		devNumber = stat.Rdev
+		devNumber = uint64(stat.Rdev)
 		major     = unix.Major(devNumber)
+		minor     = unix.Minor(devNumber)
 	)
 	if major == 0 {
 		return nil, ErrNotADevice
@@ -51,7 +52,7 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) {
 		Type:        devType,
 		Path:        path,
 		Major:       int64(major),
-		Minor:       int64(unix.Minor(devNumber)),
+		Minor:       int64(minor),
 		Permissions: permissions,
 		FileMode:    os.FileMode(mode),
 		Uid:         stat.Uid,