proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-17 16:27:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start.c:preserve_ns: added pid parameter

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Wolfgang Bumiller 2015-10-06 10:01:01 +02:00 committed by Stéphane Graber
parent 6e46cc0dca
commit 035a38fc93
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/start.c
View File

@ -124,14 +124,15 @@ static void close_ns(int ns_fd[LXC_NS_MAX]) {
} }
} }
static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) { static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags, pid_t pid) {
int i, saved_errno; int i, saved_errno;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
for (i = 0; i < LXC_NS_MAX; i++) for (i = 0; i < LXC_NS_MAX; i++)
ns_fd[i] = -1; ns_fd[i] = -1;
if (access("/proc/self/ns", X_OK)) { snprintf(path, MAXPATHLEN, "/proc/%d/ns", pid);
if (access(path, X_OK)) {
WARN("Kernel does not support attach; preserve_ns ignored"); WARN("Kernel does not support attach; preserve_ns ignored");
return 0; return 0;
} }
@ -139,7 +140,8 @@ static int preserve_ns(int ns_fd[LXC_NS_MAX], int clone_flags) {
for (i = 0; i < LXC_NS_MAX; i++) { for (i = 0; i < LXC_NS_MAX; i++) {
if ((clone_flags & ns_info[i].clone_flag) == 0) if ((clone_flags & ns_info[i].clone_flag) == 0)
continue; continue;
snprintf(path, MAXPATHLEN, "/proc/self/ns/%s", ns_info[i].proc_name); snprintf(path, MAXPATHLEN, "/proc/%d/ns/%s", pid,
ns_info[i].proc_name);
ns_fd[i] = open(path, O_RDONLY | O_CLOEXEC); ns_fd[i] = open(path, O_RDONLY | O_CLOEXEC);
if (ns_fd[i] < 0) if (ns_fd[i] < 0)
goto error; goto error;
@ -973,7 +975,7 @@ static int lxc_spawn(struct lxc_handler *handler)
INFO("failed to pin the container's rootfs"); INFO("failed to pin the container's rootfs");
} }
if (preserve_ns(saved_ns_fd, preserve_mask) < 0) if (preserve_ns(saved_ns_fd, preserve_mask, getpid()) < 0)
goto out_delete_net; goto out_delete_net;
if (attach_ns(handler->conf->inherit_ns_fd) < 0) if (attach_ns(handler->conf->inherit_ns_fd) < 0)
goto out_delete_net; goto out_delete_net;