diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 332471a409..ca69b36c22 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -2302,7 +2302,7 @@ static int run(int argc, char *argv[]) { /* Don't run things in private userns, if the mount shall be attached to the host */ if (!IN_SET(arg_action, ACTION_MOUNT, ACTION_WITH)) { - userns_fd = nsresource_allocate_userns(/* name= */ NULL, UINT64_C(0x10000)); /* allocate 64K users by default */ + userns_fd = nsresource_allocate_userns(/* name= */ NULL, NSRESOURCE_UIDS_64K); /* allocate 64K users by default */ if (userns_fd < 0) return log_error_errno(userns_fd, "Failed to allocate user namespace with 64K users: %m"); } diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 3e4565e4a2..5de826c44a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -6007,7 +6007,7 @@ static int run(int argc, char *argv[]) { goto finish; } - userns_fd = nsresource_allocate_userns(userns_name, UINT64_C(0x10000)); + userns_fd = nsresource_allocate_userns(userns_name, NSRESOURCE_UIDS_64K); /* allocate 64K UIDs */ if (userns_fd < 0) { r = log_error_errno(userns_fd, "Failed to allocate user namespace with 64K users: %m"); goto finish; @@ -6019,7 +6019,7 @@ static int run(int argc, char *argv[]) { goto finish; } - arg_uid_range = UINT32_C(0x10000); + arg_uid_range = NSRESOURCE_UIDS_64K; } if (arg_directory) { diff --git a/src/shared/nsresource.h b/src/shared/nsresource.h index c06025761a..136b1f85ac 100644 --- a/src/shared/nsresource.h +++ b/src/shared/nsresource.h @@ -3,6 +3,10 @@ #include "shared-forward.h" +/* Helpful constants for the only numbers of UIDs that can currently be allocated */ +#define NSRESOURCE_UIDS_64K 0x10000U +#define NSRESOURCE_UIDS_1 1U + int nsresource_allocate_userns(const char *name, uint64_t size); int nsresource_register_userns(const char *name, int userns_fd); int nsresource_add_mount(int userns_fd, int mount_fd);