Set umask(022) early, in fs_init(), and no place else

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-03-14 11:05:12 +01:00
1 parent 959c9fe5aa
commit 4e84ecae89
1 file changed
+4 -4
+4 -4
View File
@@ -199,7 +199,6 @@ static void fs_mount(void)
plugin_run_hooks(HOOK_MOUNT_POST); plugin_run_hooks(HOOK_MOUNT_POST);
run("swapon -ea"); run("swapon -ea");
umask(0022);
} }
/* /*
@@ -222,6 +221,9 @@ static void fs_init(void)
}; };
size_t i; size_t i;
/* mask writable bit for g and o */
umask(022);
for (i = 0; i < NELEMS(fs); i++) { for (i = 0; i < NELEMS(fs); i++) {
int rc; int rc;
@@ -479,14 +481,13 @@ int main(int argc, char *argv[])
ctx = &loop; ctx = &loop;
/* /*
* Set PATH, SHELL, PWD, and umask early to something sane * Set PATH, SHELL, and PWD early to something sane
*/ */
setenv("PATH", _PATH_STDPATH, 1); setenv("PATH", _PATH_STDPATH, 1);
setenv("SHELL", _PATH_BSHELL, 1); setenv("SHELL", _PATH_BSHELL, 1);
if (chdir("/")) if (chdir("/"))
_pe("Failed cd /"); _pe("Failed cd /");
umask(0);
/* Allow progress, if enabled */ /* Allow progress, if enabled */
enable_progress(1); enable_progress(1);
@@ -548,7 +549,6 @@ int main(int argc, char *argv[])
_d("Starting initctl API responder ..."); _d("Starting initctl API responder ...");
api_init(&loop); api_init(&loop);
umask(022);
_d("Starting the big state machine ..."); _d("Starting the big state machine ...");
schedule_work(&crank); schedule_work(&crank);