procd: Fix memory leaks found by cppcheck

[project/procd.git] / initd / early.c

diff --git a/initd/early.c b/initd/early.c
index 77ced77..bf519f6 100644 (file)
--- a/initd/early.c
+++ b/initd/early.c
@@ -21,26 +21,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "../log.h"
+#include "../utils/utils.h"
 #include "init.h"
-
-static void
-early_mounts(void)
-{
-       mount("proc", "/proc", "proc", MS_NOATIME, 0);
-       mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0);
-
-       mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, NULL);
-       mkdir("/tmp/run", 0777);
-       mkdir("/tmp/lock", 0777);
-       mkdir("/tmp/state", 0777);
-       symlink("/tmp", "/var");
-
-       mount("tmpfs", "/dev", "tmpfs", MS_NOATIME, "mode=0755,size=512K");
-       mkdir("/dev/shm", 0755);
-       mkdir("/dev/pts", 0755);
-       mount("devpts", "/dev/pts", "devpts", MS_NOATIME, "mode=600");
-}
+#include "../libc-compat.h"
 
 static void
 early_dev(void)
@@ -53,31 +36,53 @@ static void
 early_console(const char *dev)
 {
        struct stat s;
-       int dd;
 
        if (stat(dev, &s)) {
                ERROR("Failed to stat %s\n", dev);
                return;
        }
 
-       dd = open(dev, O_RDWR);
-       if (dd < 0)
-               dd = open("/dev/null", O_RDWR);
+       if (patch_stdio(dev)) {
+               ERROR("Failed to setup i/o redirection\n");
+               return;
+       }
+
+       fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
+}
 
-       dup2(dd, STDIN_FILENO);
-       dup2(dd, STDOUT_FILENO);
-       dup2(dd, STDERR_FILENO);
+static void
+early_mounts(void)
+{
+       unsigned int oldumask = umask(0);
 
-       if (dd != STDIN_FILENO &&
-           dd != STDOUT_FILENO &&
-           dd != STDERR_FILENO)
-               close(dd);
+       mount("proc", "/proc", "proc", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+       mount("sysfs", "/sys", "sysfs", MS_NOATIME | MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+       mount("cgroup", "/sys/fs/cgroup", "cgroup",  MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
+       mount("tmpfs", "/dev", "tmpfs", MS_NOATIME | MS_NOSUID, "mode=0755,size=512K");
+       ignore(symlink("/tmp/shm", "/dev/shm"));
+       mkdir("/dev/pts", 0755);
+       mount("devpts", "/dev/pts", "devpts", MS_NOATIME | MS_NOEXEC | MS_NOSUID, "mode=600");
+       early_dev();
+
+       early_console("/dev/console");
+       if (mount_zram_on_tmp()) {
+               mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME, 0);
+               mkdir("/tmp/shm", 01777);
+       } else {
+               mkdir("/tmp/shm", 01777);
+               mount("tmpfs", "/tmp/shm", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOATIME,
+                               "mode=01777");
+       }
+       mkdir("/tmp/run", 0755);
+       mkdir("/tmp/lock", 0755);
+       mkdir("/tmp/state", 0755);
+       umask(oldumask);
 }
 
 static void
 early_env(void)
 {
-       setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
+       setenv("PATH", EARLY_PATH, 1);
 }
 
 void
@@ -87,9 +92,7 @@ early(void)
                return;
 
        early_mounts();
-       early_dev();
        early_env();
-       early_console("/dev/console");
 
        LOG("Console is alive\n");
 }