mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct: fix mips compilation

Browse Source 
On MIPS arches, Rdev is uint32 so we have to convert it.

Fixes issue 4962.

Fixes: 8476df83 ("libct: add/use isDevNull, verifyDevNull")
Fixes: de87203e ("console: verify /dev/pts/ptmx before use")
Fixes: 398955bc ("console: add fallback for pre-TIOCGPTPEER kernels")
Reported-by: Tianon Gravi <admwiggin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2025-11-05 17:52:47 -08:00
parent 2f74f4ae1b
commit 1b954f1f06
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/console_linux.go
+6 -4
View File
@@ -33,9 +33,10 @@ func checkPtmxHandle(ptmx *os.File) error {
if stat.Ino != PTMX_INO { if stat.Ino != PTMX_INO {
return fmt.Errorf("ptmx handle has wrong inode number: %v", stat.Ino) return fmt.Errorf("ptmx handle has wrong inode number: %v", stat.Ino)
} }
if stat.Mode&unix.S_IFMT != unix.S_IFCHR || stat.Rdev != unix.Mkdev(PTMX_MAJOR, PTMX_MINOR) { rdev := uint64(stat.Rdev) //nolint:unconvert // Rdev is uint32 on MIPS.
if stat.Mode&unix.S_IFMT != unix.S_IFCHR || rdev != unix.Mkdev(PTMX_MAJOR, PTMX_MINOR) {
return fmt.Errorf("ptmx handle is not a real char ptmx device: ftype %#x %d:%d", return fmt.Errorf("ptmx handle is not a real char ptmx device: ftype %#x %d:%d",
stat.Mode&unix.S_IFMT, unix.Major(stat.Rdev), unix.Minor(stat.Rdev)) stat.Mode&unix.S_IFMT, unix.Major(rdev), unix.Minor(rdev))
} }
return nil return nil
}) })
@@ -79,9 +80,10 @@ func getPtyPeer(pty console.Console, unsafePeerPath string, flags int) (*os.File
if statfs.Type != unix.DEVPTS_SUPER_MAGIC { if statfs.Type != unix.DEVPTS_SUPER_MAGIC {
return fmt.Errorf("pty peer handle is not on a real devpts mount: super magic is %#x", statfs.Type) return fmt.Errorf("pty peer handle is not on a real devpts mount: super magic is %#x", statfs.Type)
} }
if stat.Mode&unix.S_IFMT != unix.S_IFCHR || stat.Rdev != wantPeerDev { rdev := uint64(stat.Rdev) //nolint:unconvert // Rdev is uint32 on MIPS.
if stat.Mode&unix.S_IFMT != unix.S_IFCHR || rdev != wantPeerDev {
return fmt.Errorf("pty peer handle is not the real char device for pty %d: ftype %#x %d:%d", return fmt.Errorf("pty peer handle is not the real char device for pty %d: ftype %#x %d:%d",
peerNum, stat.Mode&unix.S_IFMT, unix.Major(stat.Rdev), unix.Minor(stat.Rdev)) peerNum, stat.Mode&unix.S_IFMT, unix.Major(rdev), unix.Minor(rdev))
} }
return nil return nil
}); err != nil { }); err != nil {
libcontainer/rootfs_linux.go
+4 -3
View File
@@ -1044,10 +1044,10 @@ func mknodDevice(destDir *os.File, destName string, node *devices.Device) error
node.Type, node.Path, node.Type, node.Path,
stat.Mode&unix.S_IFMT, fileMode&unix.S_IFMT) stat.Mode&unix.S_IFMT, fileMode&unix.S_IFMT)
} }
if stat.Rdev != dev { if rdev := uint64(stat.Rdev); rdev != dev { //nolint:unconvert // Rdev is uint32 on MIPS.
return fmt.Errorf("new %c device inode %s has incorrect major:minor: %d:%d doesn't match expected %d:%d", return fmt.Errorf("new %c device inode %s has incorrect major:minor: %d:%d doesn't match expected %d:%d",
node.Type, node.Path, node.Type, node.Path,
unix.Major(stat.Rdev), unix.Minor(stat.Rdev), unix.Major(rdev), unix.Minor(rdev),
unix.Major(dev), unix.Minor(dev)) unix.Major(dev), unix.Minor(dev))
} }
return nil return nil
@@ -1318,7 +1318,8 @@ func remountReadonly(m *configs.Mount) error {
} }
func isDevNull(st *unix.Stat_t) bool { func isDevNull(st *unix.Stat_t) bool {
return st.Mode&unix.S_IFMT == unix.S_IFCHR && st.Rdev == unix.Mkdev(1, 3) //nolint:unconvert // Rdev is uint32 on MIPS.
return st.Mode&unix.S_IFMT == unix.S_IFCHR && uint64(st.Rdev) == unix.Mkdev(1, 3)
} }
func verifyDevNull(f *os.File) error { func verifyDevNull(f *os.File) error {