Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools: lxc-unshare: replace write_id_mapping() to the same function in conf.c #2454

Merged
merged 1 commit into from Jul 7, 2018
Merged

tools: lxc-unshare: replace write_id_mapping() to the same function in conf.c #2454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 2 additions & 23 deletions src/lxc/tools/lxc_unshare.c
View file
Open in desktop
Expand Up @@ -41,6 +41,7 @@

#include "arguments.h"
#include "caps.h"
#include "conf.h"
#include "namespace.h"
#include "utils.h"

Expand Down Expand Up @@ -220,28 +221,6 @@ static int do_start(void *arg)
return 1;
}

static int write_id_mapping(pid_t pid, const char *buf, size_t buf_size)
{
char path[MAXPATHLEN];
int fd, ret;

ret = snprintf(path, MAXPATHLEN, "/proc/%d/uid_map", pid);
if (ret < 0 || ret >= MAXPATHLEN)
return -E2BIG;

fd = open(path, O_WRONLY);
if (fd < 0)
return -1;

errno = 0;
ret = lxc_write_nointr(fd, buf, buf_size);
close(fd);
if (ret < 0 || (size_t)ret != buf_size)
return -1;

return 0;
}

int main(int argc, char *argv[])
{
char **args;
Expand Down Expand Up @@ -357,7 +336,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}

ret = write_id_mapping(pid, umap, strlen(umap));
ret = write_id_mapping(ID_TYPE_UID, pid, umap, strlen(umap));
if (ret < 0) {
close(start_arg.wait_fd);
fprintf(stderr, "uid mapping failed\n");
Expand Down