Skip to content

Commit

Permalink
conf: fix suggest_default_idmap()
Browse files Browse the repository at this point in the history
We need to remove the newline otherwise lxc_safe_uint() will fail as it detects
an invalid (non-numeric) char in the string.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner authored and stgraber committed Jan 5, 2017
1 parent 569c5fe commit f53c6ce
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/lxc/conf.c
Expand Up @@ -4513,6 +4513,7 @@ void suggest_default_idmap(void)
return;
}
while (getline(&line, &len, f) != -1) {
size_t no_newline = 0;
char *p = strchr(line, ':'), *p2;
if (*line == '#')
continue;
Expand All @@ -4529,6 +4530,9 @@ void suggest_default_idmap(void)
p2++;
if (!*p2)
continue;
no_newline = strcspn(p2, "\n");
p2[no_newline] = '\0';

if (lxc_safe_uint(p, &uid) < 0)
WARN("Could not parse UID.");
if (lxc_safe_uint(p2, &urange) < 0)
Expand All @@ -4544,6 +4548,7 @@ void suggest_default_idmap(void)
return;
}
while (getline(&line, &len, f) != -1) {
size_t no_newline = 0;
char *p = strchr(line, ':'), *p2;
if (*line == '#')
continue;
Expand All @@ -4560,6 +4565,9 @@ void suggest_default_idmap(void)
p2++;
if (!*p2)
continue;
no_newline = strcspn(p2, "\n");
p2[no_newline] = '\0';

if (lxc_safe_uint(p, &gid) < 0)
WARN("Could not parse GID.");
if (lxc_safe_uint(p2, &grange) < 0)
Expand Down

0 comments on commit f53c6ce

Please sign in to comment.