summaryrefslogtreecommitdiff
path: root/pkg/util
diff options
context:
space:
mode:
authorRobb Manes <robbmanes@protonmail.com>2022-02-16 15:08:41 -0500
committerRobb Manes <robbmanes@protonmail.com>2022-02-16 15:47:02 -0500
commit90066af62e08da7a2795d163f181e4a4b2225869 (patch)
tree2f887c7b4df3a1df1e9e1208c56d060b9a9be134 /pkg/util
parentf918a9418f5eeb00b289c127142953da2c394867 (diff)
downloadpodman-90066af62e08da7a2795d163f181e4a4b2225869.tar.gz
podman-90066af62e08da7a2795d163f181e4a4b2225869.tar.bz2
podman-90066af62e08da7a2795d163f181e4a4b2225869.zip
Calculate device major/minor using bitshift
Previously, devices with a major/minor number >256 would fail to be detected. Switch to using bitwise conversion (similar to sys/sysmacros in C). [NO NEW TESTS NEEDED] Signed-off-by: Robb Manes <robbmanes@protonmail.com>
Diffstat (limited to 'pkg/util')
-rw-r--r--pkg/util/utils_linux.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/util/utils_linux.go b/pkg/util/utils_linux.go
index 288137ca5..1cffab19d 100644
--- a/pkg/util/utils_linux.go
+++ b/pkg/util/utils_linux.go
@@ -39,8 +39,10 @@ func FindDeviceNodes() (map[string]string, error) {
if !ok {
return errors.Errorf("Could not convert stat output for use")
}
- major := sysstat.Rdev / 256
- minor := sysstat.Rdev % 256
+ // We must typeconvert sysstat.Rdev from uint64->int to avoid constant overflow
+ rdev := int(sysstat.Rdev)
+ major := ((rdev >> 8) & 0xfff) | ((rdev >> 32) & ^0xfff)
+ minor := (rdev & 0xff) | ((rdev >> 12) & ^0xff)
nodes[fmt.Sprintf("%d:%d", major, minor)] = path