libct: fix mips compilation#4964
Merged
cyphar merged 1 commit intoopencontainers:mainfrom Nov 6, 2025
Merged
Conversation
On MIPS arches, Rdev is uint32 so we have to convert it. Fixes issue 4962. Fixes: 8476df8 ("libct: add/use isDevNull, verifyDevNull") Fixes: de87203 ("console: verify /dev/pts/ptmx before use") Fixes: 398955b ("console: add fallback for pre-TIOCGPTPEER kernels") Reported-by: Tianon Gravi <[email protected]> Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
added
backport/1.2-pr
There was a problem hiding this comment.
Pull Request Overview
This PR addresses type conversion issues for stat.Rdev across different architectures, specifically MIPS where Rdev is uint32 instead of uint64. The changes add explicit conversions to uint64 before comparing with or passing to functions that expect uint64, preventing compiler warnings or errors on platforms where Rdev is not uint64.
Key Changes:
- Add
uint64()type conversions forstat.Rdevcomparisons and function calls - Include
//nolint:unconvertcomments to suppress linter warnings on architectures where the conversion is unnecessary
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| libcontainer/rootfs_linux.go | Converts stat.Rdev to uint64 in device comparison and Major/Minor function calls |
| libcontainer/console_linux.go | Converts stat.Rdev to uint64 in ptmx and pty peer device verification code |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
AkihiroSuda
approved these changes
Nov 6, 2025
cyphar
approved these changes
Nov 6, 2025
This was referenced Nov 6, 2025
kolyshkin
added
backport/1.2-done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On MIPS arches, Rdev is uint32 so we have to convert it.
Can't test this for mips in CI (adding mips compile which is not easy as distros drop mips support).
Tested locally with:
(which still errors out but it's not related).
Fixes: #4962.
Fixes: 8476df8 ("libct: add/use isDevNull, verifyDevNull")
Fixes: de87203 ("console: verify /dev/pts/ptmx before use")
Fixes: 398955b ("console: add fallback for pre-TIOCGPTPEER kernels")
Reported-by: @tianon