woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user: better check for uids/gids existence

Browse Source
This commit is contained in:
Robert Swiecki 2017-05-28 01:16:48 +02:00
parent d7ccf0c9d8
commit b5b47938d9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
user.c
View File

@ -131,6 +131,7 @@ static bool userGidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
idx++;
struct idmap_t *p;
bool use = false;
TAILQ_FOREACH(p, &nsjconf->gids, pointers) {
if (p->is_newidmap == false) {
continue;
@ -139,6 +140,7 @@ static bool userGidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
LOG_W("Number of arguments to '/usr/bin/newgidmap' too big");
return false;
}
use = true;
snprintf(parms[idx], sizeof(parms[idx]), "%u", (unsigned)p->inside_id);
argv[idx] = parms[idx];
@ -155,7 +157,7 @@ static bool userGidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
argv[idx] = NULL;
if (idx < 4) {
if (!use) {
return true;
}
@ -181,6 +183,7 @@ static bool userUidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
argv[idx] = parms[idx];
idx++;
bool use = false;
struct idmap_t *p;
TAILQ_FOREACH(p, &nsjconf->uids, pointers) {
if (p->is_newidmap == false) {
@ -190,6 +193,7 @@ static bool userUidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
LOG_W("Number of arguments to '/usr/bin/newuidmap' too big");
return false;
}
use = true;
snprintf(parms[idx], sizeof(parms[idx]), "%u", (unsigned)p->inside_id);
argv[idx] = parms[idx];
@ -206,7 +210,7 @@ static bool userUidMapExternal(struct nsjconf_t *nsjconf, pid_t pid UNUSED)
argv[idx] = NULL;
if (idx < 4) {
if (!use) {
return true;
}