utils: fix creating default userns #1073
Merged
Conversation
This file contains 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
fix creating the default user namespace when the GID on the host is different than the UID and there is not not already a mapping specified in the OCI configuration. Closes: containers#1072 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
rhatdan
reviewed
Nov 18, 2022
| @@ -323,7 +323,7 @@ int copy_from_fd_to_fd (int src, int dst, int consume, libcrun_error_t *err); | |||
|
|
|||
| int run_process (char **args, libcrun_error_t *err); | |||
|
|
|||
| size_t format_default_id_mapping (char **ret, uid_t container_id, uid_t host_id, int is_uid); | |||
| size_t format_default_id_mapping (char **ret, uid_t container_id, uid_t host_uid, uid_t host_id, int is_uid); | |||
There was a problem hiding this comment.
Shouldn't this be (..., uid_t host_uid, uid_t host_gid,...)
There was a problem hiding this comment.
host_id is either UID or GID, depending on the value of is_uid. We need to differentiate since we use different files for the lookup (/etc/subuid or /etc/subgid)
rhatdan
reviewed
Nov 18, 2022
| @@ -1403,15 +1403,15 @@ getsubidrange (uid_t id, int is_uid, uint32_t *from, uint32_t *len) | |||
| #define MIN(x, y) ((x) < (y) ? (x) : (y)) | |||
|
|
|||
| size_t | |||
| format_default_id_mapping (char **ret, uid_t container_id, uid_t host_id, int is_uid) | |||
| format_default_id_mapping (char **ret, uid_t container_id, uid_t host_uid, uid_t host_id, int is_uid) | |||
There was a problem hiding this comment.
Shouldn't this be (..., uid_t host_uid, uid_t host_gid,...)
There was a problem hiding this comment.
@rhatdan is this resolved I think this has same explanation as the above one.
|
LGTM |
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.
fix creating the default user namespace when the GID on the host is different than the UID and there is not not already a mapping specified in the OCI configuration.
Closes: #1072
Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com