From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 27 Jan 2021 19:51:20 +0000 (+0100)
Subject: attach: make do_attach() void
X-Git-Tag: lxc-5.0.0~314^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab02267f01e4201c1a38600516ae0bd6baf620d;p=thirdparty%2Flxc.git

attach: make do_attach() void

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index e2a7de8e9..e73a1f265 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -644,7 +644,7 @@ static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
 	}
 }
 
-__noreturn static int do_attach(struct attach_clone_payload *payload)
+__noreturn static void do_attach(struct attach_clone_payload *payload)
 {
 	int lsm_fd, ret;
 	uid_t new_uid;
@@ -892,6 +892,7 @@ __noreturn static int do_attach(struct attach_clone_payload *payload)
 
 on_error:
 	lxc_put_attach_clone_payload(payload);
+	ERROR("Failed to attach to container");
 	_exit(EXIT_FAILURE);
 }
 
@@ -1223,11 +1224,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
 				}
 			}
 
-			ret = do_attach(&payload);
-			if (ret < 0)
-				ERROR("Failed to exec");
-
-			_exit(EXIT_FAILURE);
+			do_attach(&payload);
 		}
 
 		if (options->attach_flags & LXC_ATTACH_TERMINAL)