From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 25 Feb 2019 16:05:24 +0000 (+0100)
Subject: attach: use move_fd in lxc_proc_close_ns_fd
X-Git-Tag: lxc-3.2.0~130^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f9facdac9fed59f5e4b52a35bf550a417ae7e7e;p=thirdparty%2Flxc.git

attach: use move_fd in lxc_proc_close_ns_fd

Previously this set `ctx->ns_fd[*]` to `-EBADF` until commit
fd2a88b190eb ("attach: cleanup macros lxc_proc_close_ns_fd",
but there are some code paths where we call this before
later calling `lxc_proc_put_context_info` which would call
this function again with the file descriptors still
unchanged.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index e00584178..288458230 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -126,7 +126,7 @@ static struct lxc_proc_context_info *lxc_proc_get_context_info(pid_t pid)
 static inline void lxc_proc_close_ns_fd(struct lxc_proc_context_info *ctx)
 {
 	for (int i = 0; i < LXC_NS_MAX; i++) {
-		__do_close_prot_errno int fd = ctx->ns_fd[i];
+		__do_close_prot_errno int fd = move_fd(ctx->ns_fd[i]);
 	}
 }