proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-05-02 03:44:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4173 from brauner/2022-07-25.lxc-usernsexec

Browse Source 
lxc-usernsexec: allow to select which {g,u}id to switch to
This commit is contained in:
Stéphane Graber 2022-07-25 17:22:24 -04:00 committed by GitHub
commit 332667eb21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/cmd/lxc_usernsexec.c
View File

@ -32,6 +32,9 @@
#include "utils.h" #include "utils.h"
__hidden extern int lxc_log_fd; __hidden extern int lxc_log_fd;
/* Assume we want to become root */
static uid_t uid = 0;
static gid_t gid = 0;
static void usage(const char *name) static void usage(const char *name)
{ {
@ -90,8 +93,7 @@ static int do_child(void *vargv)
if (!lxc_drop_groups() && errno != EPERM) if (!lxc_drop_groups() && errno != EPERM)
return -1; return -1;
/* Assume we want to become root */ if (!lxc_switch_uid_gid(uid, gid))
if (!lxc_switch_uid_gid(0, 0))
return -1; return -1;
ret = unshare(CLONE_NEWNS); ret = unshare(CLONE_NEWNS);
@ -328,7 +330,7 @@ int main(int argc, char *argv[])
} }
} }
while ((c = getopt(argc, argv, "m:hs")) != EOF) { while ((c = getopt(argc, argv, "m:hsu:g:")) != EOF) {
switch (c) { switch (c) {
case 'm': case 'm':
ret = parse_map(optarg); ret = parse_map(optarg);
@ -343,6 +345,14 @@ int main(int argc, char *argv[])
case 's': case 's':
map_self = true; map_self = true;
break; break;
case 'u':
if (lxc_safe_uint(optarg, &uid) < 0)
return -1;
break;
case 'g':
if (lxc_safe_uint(optarg, &gid) < 0)
return -1;
break;
default: default:
usage(argv[0]); usage(argv[0]);
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);