From dab02267f01e4201c1a38600516ae0bd6baf620d Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 27 Jan 2021 20:51:20 +0100 Subject: [PATCH] attach: make do_attach() void Cc: stable-4.0 Signed-off-by: Christian Brauner --- src/lxc/attach.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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) -- 2.47.3