From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 29 Jan 2021 12:10:14 +0000 (+0100)
Subject: attach: s/close/close_prot_errno_disarm/g
X-Git-Tag: lxc-5.0.0~313^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2420df26446caa4ad4755fb3fdf579004a3241;p=thirdparty%2Flxc.git

attach: s/close/close_prot_errno_disarm/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index a8cfe360b..adc9b4088 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -864,7 +864,7 @@ __noreturn static void do_attach(struct attach_clone_payload *payload)
 			lsm_label = ctx->lsm_label;
 		ret = ctx->lsm_ops->process_label_set_at(ctx->lsm_ops, lsm_fd,
 							lsm_label, on_exec);
-		close(lsm_fd);
+		close_prot_errno_disarm(lsm_fd);
 		if (ret < 0)
 			goto on_error;
 
@@ -1279,7 +1279,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
 	to_cleanup_pid = pid;
 
 	/* close unneeded file descriptors */
-	close(ipc_sockets[1]);
+	close_prot_errno_disarm(ipc_sockets[1]);
 	close_nsfds(ctx);
 	if (options->attach_flags & LXC_ATTACH_TERMINAL)
 		lxc_attach_terminal_close_pts(&terminal);
@@ -1406,8 +1406,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
 
 	/* Now shut down communication with child, we're done. */
 	shutdown(ipc_sockets[0], SHUT_RDWR);
-	close(ipc_sockets[0]);
-	ipc_sockets[0] = -1;
+	close_prot_errno_disarm(ipc_sockets[0]);
 
 	ret_parent = 0;
 	to_cleanup_pid = -1;
@@ -1427,7 +1426,7 @@ close_mainloop:
 on_error:
 	if (ipc_sockets[0] >= 0) {
 		shutdown(ipc_sockets[0], SHUT_RDWR);
-		close(ipc_sockets[0]);
+		close_prot_errno_disarm(ipc_sockets[0]);
 	}
 
 	if (to_cleanup_pid > 0)