proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 15:34:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attach: move errno handling

Browse Source 
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
This commit is contained in:
2xsec 2018-07-21 18:17:18 +09:00
parent ea918412a7
commit 21d0acc2a5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/attach.c
View File

@ -190,7 +190,7 @@ static void lxc_proc_put_context_info(struct lxc_proc_context_info *ctx)
static int in_same_namespace(pid_t pid1, pid_t pid2, const char *ns) static int in_same_namespace(pid_t pid1, pid_t pid2, const char *ns)
{ {
int ns_fd1 = -1, ns_fd2 = -1, ret = -1; int ns_fd1 = -1, ns_fd2 = -1, ret = -1;
int saved_errno = errno; int saved_errno;
struct stat ns_st1, ns_st2; struct stat ns_st1, ns_st2;
ns_fd1 = lxc_preserve_ns(pid1, ns); ns_fd1 = lxc_preserve_ns(pid1, ns);
@ -201,27 +201,20 @@ static int in_same_namespace(pid_t pid1, pid_t pid2, const char *ns)
if (errno == ENOENT) if (errno == ENOENT)
return -EINVAL; return -EINVAL;
saved_errno = errno;
goto out; goto out;
} }
ns_fd2 = lxc_preserve_ns(pid2, ns); ns_fd2 = lxc_preserve_ns(pid2, ns);
if (ns_fd2 < 0) { if (ns_fd2 < 0)
saved_errno = errno;
goto out; goto out;
}
ret = fstat(ns_fd1, &ns_st1); ret = fstat(ns_fd1, &ns_st1);
if (ret < 0) { if (ret < 0)
saved_errno = errno;
goto out; goto out;
}
ret = fstat(ns_fd2, &ns_st2); ret = fstat(ns_fd2, &ns_st2);
if (ret < 0) { if (ret < 0)
saved_errno = errno;
goto out; goto out;
}
/* processes are in the same namespace */ /* processes are in the same namespace */
if ((ns_st1.st_dev == ns_st2.st_dev ) && (ns_st1.st_ino == ns_st2.st_ino)) { if ((ns_st1.st_dev == ns_st2.st_dev ) && (ns_st1.st_ino == ns_st2.st_ino)) {
@ -234,6 +227,8 @@ static int in_same_namespace(pid_t pid1, pid_t pid2, const char *ns)
ns_fd2 = -1; ns_fd2 = -1;
out: out:
saved_errno = errno;
if (ns_fd1 >= 0) if (ns_fd1 >= 0)
close(ns_fd1); close(ns_fd1);
@ -246,13 +241,14 @@ out:
static int lxc_attach_to_ns(pid_t pid, struct lxc_proc_context_info *ctx) static int lxc_attach_to_ns(pid_t pid, struct lxc_proc_context_info *ctx)
{ {
int i; int i, ret;
for (i = 0; i < LXC_NS_MAX; i++) { for (i = 0; i < LXC_NS_MAX; i++) {
if (ctx->ns_fd[i] < 0) if (ctx->ns_fd[i] < 0)
continue; continue;
if (setns(ctx->ns_fd[i], ns_info[i].clone_flag) < 0) { ret = setns(ctx->ns_fd[i], ns_info[i].clone_flag);
if (ret < 0) {
SYSERROR("Failed to attach to %s namespace of %d", SYSERROR("Failed to attach to %s namespace of %d",
ns_info[i].proc_name, pid); ns_info[i].proc_name, pid);
return -1; return -1;