X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Fearly.c;h=5821c58f20aa8b3822cbd89809069c476612be39;hp=e57ea9d6207b7ec0c90b4af54f4c22ad7ed4964e;hb=45cb04fd85d788a37367a5385e5e90dd98a0a991;hpb=acb157e638aa93490ca84be381c28643d50d4e4a

diff --git a/initd/early.c b/initd/early.c
index e57ea9d..5821c58 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include "init.h"
+#include "../libc-compat.h"
 
 static void
 early_dev(void)
@@ -60,29 +61,36 @@ early_console(const char *dev)
 static void
 early_mounts(void)
 {
-	mount("proc", "/proc", "proc", MS_NOATIME, 0);
-	mount("sysfs", "/sys", "sysfs", MS_NOATIME, 0);
-	mount("none", "/sys/fs/cgroup", "cgroup", 0, 0);
-	mount("tmpfs", "/dev", "tmpfs", MS_NOATIME, "mode=0755,size=512K");
-	mkdir("/dev/shm", 01777);
+	unsigned int oldumask = umask(0);
+
+	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, "mode=600");
+	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, NULL);
-	else
-		mkdev("*", 0600);
+	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", 0777);
 	mkdir("/tmp/lock", 0777);
 	mkdir("/tmp/state", 0777);
+	umask(oldumask);
 }
 
 static void
 early_env(void)
 {
-	setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
+	setenv("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
 }
 
 void