log.h: new log_oom() -> int -ENOMEM, use it

[elogind.git] / src / nspawn / nspawn.c

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 14de7f8b43b135c4a000abf1eda8ef12d00c0081..b9fa02dc7680a6486adefb6c6a05433b4c94d560 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -205,10 +205,8 @@ static int parse_argv(int argc, char *argv[]) {
                                 char *t;
 
                                 t = strndup(word, length);
-                                if (!t) {
-                                        log_error("Out of memory.");
-                                        return -ENOMEM;
-                                }
+                                if (!t)
+                                        return log_oom();
 
                                 if (cap_from_name(t, &cap) < 0) {
                                         log_error("Failed to parse capability %s.", t);
@@ -289,7 +287,7 @@ static int mount_all(const char *dest) {
                 int t;
 
                 if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) {
-                        log_error("Out of memory");
+                        log_oom();
 
                         if (r == 0)
                                 r = -ENOMEM;
@@ -335,20 +333,16 @@ static int setup_timezone(const char *dest) {
         assert(dest);
 
         /* Fix the timezone, if possible */
-        if (asprintf(&where, "%s/etc/localtime", dest) < 0) {
-                log_error("Out of memory");
-                return -ENOMEM;
-        }
+        if (asprintf(&where, "%s/etc/localtime", dest) < 0)
+                return log_oom();
 
         if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0)
                 mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
 
         free(where);
 
-        if (asprintf(&where, "%s/etc/timezone", dest) < 0) {
-                log_error("Out of memory");
-                return -ENOMEM;
-        }
+        if (asprintf(&where, "%s/etc/timezone", dest) < 0)
+                return log_oom();
 
         if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0)
                 mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL);
@@ -368,8 +362,7 @@ static int setup_resolv_conf(const char *dest) {
 
         /* Fix resolv.conf, if possible */
         if (asprintf(&where, "%s/etc/resolv.conf", dest) < 0) {
-                log_error("Out of memory");
-                return -ENOMEM;
+                return log_oom();
         }
 
         if (mount("/etc/resolv.conf", where, "bind", MS_BIND, NULL) >= 0)
@@ -480,8 +473,7 @@ static int setup_dev_console(const char *dest, const char *console) {
         }
 
         if (asprintf(&to, "%s/dev/console", dest) < 0) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -535,14 +527,12 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
          * avoid any problems with containers deadlocking due to this
          * we simply make /dev/kmsg unavailable to the container. */
         if (asprintf(&from, "%s/dev/kmsg", dest) < 0) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
         if (asprintf(&to, "%s/proc/kmsg", dest) < 0) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -639,8 +629,7 @@ static int setup_journal(const char *directory) {
 
         p = strappend(directory, "/etc/machine-id");
         if (!p) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -670,8 +659,7 @@ static int setup_journal(const char *directory) {
         p = strappend("/var/log/journal/", l);
         q = strjoin(directory, "/var/log/journal/", l, NULL);
         if (!p || !q) {
-                log_error("Out of memory");
-                r = -ENOMEM;
+                r = log_oom();
                 goto finish;
         }
 
@@ -808,13 +796,15 @@ static int process_pty(int master, sigset_t *mask) {
         fd_nonblock(STDOUT_FILENO, 1);
         fd_nonblock(master, 1);
 
-        if ((signal_fd = signalfd(-1, mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) {
+        signal_fd = signalfd(-1, mask, SFD_NONBLOCK|SFD_CLOEXEC);
+        if (signal_fd < 0) {
                 log_error("signalfd(): %m");
                 r = -errno;
                 goto finish;
         }
 
-        if ((ep = epoll_create1(EPOLL_CLOEXEC)) < 0) {
+        ep = epoll_create1(EPOLL_CLOEXEC);
+        if (ep < 0) {
                 log_error("Failed to create epoll: %m");
                 r = -errno;
                 goto finish;
@@ -850,7 +840,8 @@ static int process_pty(int master, sigset_t *mask) {
                 ssize_t k;
                 int i, nfds;
 
-                if ((nfds = epoll_wait(ep, ev, ELEMENTSOF(ev), -1)) < 0) {
+                nfds = epoll_wait(ep, ev, ELEMENTSOF(ev), -1);
+                if (nfds < 0) {
 
                         if (errno == EINTR || errno == EAGAIN)
                                 continue;
@@ -885,7 +876,8 @@ static int process_pty(int master, sigset_t *mask) {
                                 struct signalfd_siginfo sfsi;
                                 ssize_t n;
 
-                                if ((n = read(signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
+                                n = read(signal_fd, &sfsi, sizeof(sfsi));
+                                if (n != sizeof(sfsi)) {
 
                                         if (n >= 0) {
                                                 log_error("Failed to read from signalfd: invalid block size");
@@ -921,7 +913,8 @@ static int process_pty(int master, sigset_t *mask) {
 
                         if (stdin_readable && in_buffer_full < LINE_MAX) {
 
-                                if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full)) < 0) {
+                                k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full);
+                                if (k < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 stdin_readable = false;
@@ -936,7 +929,8 @@ static int process_pty(int master, sigset_t *mask) {
 
                         if (master_writable && in_buffer_full > 0) {
 
-                                if ((k = write(master, in_buffer, in_buffer_full)) < 0) {
+                                k = write(master, in_buffer, in_buffer_full);
+                                if (k < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 master_writable = false;
@@ -955,7 +949,8 @@ static int process_pty(int master, sigset_t *mask) {
 
                         if (master_readable && out_buffer_full < LINE_MAX) {
 
-                                if ((k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full)) < 0) {
+                                k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full);
+                                if (k < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 master_readable = false;
@@ -970,7 +965,8 @@ static int process_pty(int master, sigset_t *mask) {
 
                         if (stdout_writable && out_buffer_full > 0) {
 
-                                if ((k = write(STDOUT_FILENO, out_buffer, out_buffer_full)) < 0) {
+                                k = write(STDOUT_FILENO, out_buffer, out_buffer_full);
+                                if (k < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 stdout_writable = false;
@@ -1015,7 +1011,8 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        if ((r = parse_argv(argc, argv)) <= 0)
+        r = parse_argv(argc, argv);
+        if (r <= 0)
                 goto finish;
 
         if (arg_directory) {
@@ -1054,7 +1051,8 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if ((k = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &oldcg)) < 0) {
+        k = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &oldcg);
+        if (k < 0) {
                 log_error("Failed to determine current cgroup: %s", strerror(-k));
                 goto finish;
         }
@@ -1070,18 +1068,20 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        STRV_FOREACH(controller,arg_controllers) {
+        STRV_FOREACH(controller, arg_controllers) {
                 k = cg_create_and_attach(*controller, newcg, 0);
                 if (k < 0)
                         log_warning("Failed to create cgroup in controller %s: %s", *controller, strerror(-k));
         }
 
-        if ((master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY)) < 0) {
+        master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
+        if (master < 0) {
                 log_error("Failed to acquire pseudo tty: %m");
                 goto finish;
         }
 
-        if (!(console = ptsname(master))) {
+        console = ptsname(master);
+        if (!console) {
                 log_error("Failed to determine tty name: %m");
                 goto finish;
         }
@@ -1163,15 +1163,26 @@ int main(int argc, char *argv[]) {
                 assert_se(sigemptyset(&mask) == 0);
                 assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
 
-                if (setsid() < 0)
+                if (open_terminal(console, O_RDWR) != STDIN_FILENO ||
+                    dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO ||
+                    dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
+                        goto child_fail;
+
+                if (setsid() < 0) {
+                        log_error("setsid() failed: %m");
                         goto child_fail;
+                }
 
-                if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0)
+                if (prctl(PR_SET_PDEATHSIG, SIGKILL) < 0) {
+                        log_error("PR_SET_PDEATHSIG failed: %m");
                         goto child_fail;
+                }
 
                 /* Mark / as private, in case somebody marked it shared */
-                if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0)
+                if (mount(NULL, "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) {
+                        log_error("MS_PRIVATE|MS_REC failed: %m");
                         goto child_fail;
+                }
 
                 /* Turn directory into bind mount */
                 if (mount(arg_directory, arg_directory, "bind", MS_BIND, NULL) < 0) {
@@ -1213,11 +1224,6 @@ int main(int argc, char *argv[]) {
                         goto child_fail;
                 }
 
-                if (open_terminal("dev/console", O_RDWR) != STDIN_FILENO ||
-                    dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO ||
-                    dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
-                        goto child_fail;
-
                 if (mount(arg_directory, "/", "bind", MS_MOVE, NULL) < 0) {
                         log_error("mount(MS_BIND) failed: %m");
                         goto child_fail;
@@ -1278,13 +1284,13 @@ int main(int argc, char *argv[]) {
                 if ((asprintf((char**)(envp + 3), "HOME=%s", home ? home: "/root") < 0) ||
                     (asprintf((char**)(envp + 4), "USER=%s", arg_user ? arg_user : "root") < 0) ||
                     (asprintf((char**)(envp + 5), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) {
-                    log_error("Out of memory");
+                    log_oom();
                     goto child_fail;
                 }
 
                 if (arg_uuid) {
                         if (asprintf((char**)(envp + 6), "container_uuid=%s", arg_uuid) < 0) {
-                                log_error("Out of memory");
+                                log_oom();
                                 goto child_fail;
                         }
                 }