chroot: don't panic on --skip-chdir with a non-resolving NEWROOT - #12732
Merged
cakebaker merged 1 commit intoJun 11, 2026
Conversation
`chroot --skip-chdir NEWROOT` aborted with a Result::unwrap panic when NEWROOT did not resolve: the permitted-only-if check canonicalized NEWROOT and unwrapped the result, but `canonicalize` returns Err when the path (or a component) doesn't exist or isn't readable. Map the Err to a non-match (`.ok().as_deref().and_then(|p| p.to_str())`) so a non-resolving NEWROOT takes the existing "only permitted if NEWROOT is old '/'" usage error (exit 125) like GNU, instead of crashing. This happens during argument validation before any chroot syscall. Adds a regression test.
|
GNU testsuite comparison: |
Contributor
|
Thanks! |
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
2 participants
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.
Fixes #12731
chroot --skip-chdir NEWROOTaborted with aResult::unwrap()panic when NEWROOT did not resolve: the permitted-only-if check canonicalized NEWROOT and unwrapped the result, butcanonicalizereturnsErrwhen the path (or a component) doesn't exist or isn't readable.Map the
Errto a non-match (.ok().as_deref().and_then(|p| p.to_str())) so a non-resolving NEWROOT takes the existing "only permitted if NEWROOT is old '/'" usage error (exit 125) like GNU, instead of crashing. The check runs during argument validation before any chroot syscall. Adds a regression test.