summaryrefslogtreecommitdiff
path: root/udev/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-05-30 23:42:11 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-05-30 23:42:47 +0200
commit1182b9470f61ca00fb600f9af0c148f1e6c04355 (patch)
tree6ac8b323033e11f504fa3ddc27294a1455f92da4 /udev/udevd.c
parenta07c29ca194e3cb1cb4296f76a06d92a97a117f1 (diff)
udevd: set umask before creating files/directories
Diffstat (limited to 'udev/udevd.c')
-rw-r--r--udev/udevd.c46
1 files changed, 24 insertions, 22 deletions
diff --git a/udev/udevd.c b/udev/udevd.c
index 612f04d1b9..6dd59ae697 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -1033,12 +1033,6 @@ int main(int argc, char *argv[])
}
}
- if (getuid() != 0) {
- fprintf(stderr, "root privileges required\n");
- err(udev, "root privileges required\n");
- goto exit;
- }
-
/*
* read the kernel commandline, in case we need to get into debug mode
* udev.log-priority=<level> syslog priority
@@ -1073,7 +1067,17 @@ int main(int argc, char *argv[])
fclose(f);
}
- /* make sure std{in,out,err} fds are in a sane state */
+ if (getuid() != 0) {
+ fprintf(stderr, "root privileges required\n");
+ err(udev, "root privileges required\n");
+ goto exit;
+ }
+
+ /* set umask before creating any file/directory */
+ chdir("/");
+ umask(022);
+
+ /* before opening new files, make sure std{in,out,err} fds are in a sane state */
fd = open("/dev/null", O_RDWR);
if (fd < 0) {
fprintf(stderr, "cannot open /dev/null\n");
@@ -1174,6 +1178,14 @@ int main(int argc, char *argv[])
goto exit;
}
+ if (!debug) {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ }
+ if (fd > STDERR_FILENO)
+ close(fd);
+
if (daemonize) {
pid_t pid;
@@ -1191,27 +1203,17 @@ int main(int argc, char *argv[])
}
}
+ /* set scheduling priority for the main daemon process */
+ setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
+
+ setsid();
+
f = fopen("/dev/kmsg", "w");
if (f != NULL) {
fprintf(f, "<6>udev: starting version " VERSION "\n");
fclose(f);
}
- if (!debug) {
- dup2(fd, STDIN_FILENO);
- dup2(fd, STDOUT_FILENO);
- dup2(fd, STDERR_FILENO);
- }
- if (fd > STDERR_FILENO)
- close(fd);
-
- /* set scheduling priority for the main daemon process */
- setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
-
- chdir("/");
- umask(022);
- setsid();
-
/* OOM_DISABLE == -17 */
fd = open("/proc/self/oom_adj", O_RDWR);
if (fd < 0) {