[20.10 backport] Fix userns-remap option when username & UID match#42013
Merged
tiborvass merged 1 commit intoFeb 18, 2021
Merged
Conversation
thaJeztah
added
status/2-code-review
area/security/userns
kind/bugfix
Signed-off-by: Grant Millar <[email protected]> (cherry picked from commit 2ad187f) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
rebased to trigger CI with test-fixes that were merged |
thaJeztah
force-pushed
the
20.10_backport_42003_fix_userns_uid_username_match
branch
from
February 17, 2021 20:14
2202f89 to
94d2467
Compare
tiborvass
approved these changes
Feb 18, 2021
thaJeztah
deleted the
20.10_backport_42003_fix_userns_uid_username_match
branch
February 18, 2021 21:27
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
4 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.
backport of #42004
- What I did
Fixes #42003 by only matching UID or username.
- How I did it
Check
subuidRangesWithUIDfirst thensubuidRangesWithUserName.- How to verify it
echo "10426:x:10426:10426::/nonexistent:/bin/false" >> /etc/passwdecho "10426:x:10426:" >> /etc/groupecho "10426:10426000:10000" >> /etc/subuidecho "10426:10426000:10000" >> /etc/subgiddockerd --userns-remap=10426 &docker run hello-world- Description for the changelog
Fix userns-remap option when username & UID match
- A picture of a cute animal (not mandatory but encouraged)
