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 e2a7de8e985ea6dfe3745981e4081bd65aa9db2b..e73a1f26554c287538ed7f6ecff126bf30d6e14e 100644 (file)
--- 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)