X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=95c646802918ee8da6083069a6881da2f8acfc5c;hp=8922ff9f8e3bcf134bb32a8a5214cadf09489910;hb=6f5cf8a8b1de763383f7382821147e538b7dbd6d;hpb=959d654105c1303d0c475868a51834db2f7b6099 diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 8922ff9f8..95c646802 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -986,11 +986,20 @@ static void kernel_cmdline_options(struct udev *udev) { log_set_max_level(prio); udev_set_log_priority(udev, prio); } else if (startswith(opt, "udev.children-max=")) { - arg_children_max = strtoul(opt + 18, NULL, 0); + r = safe_atoi(opt + 18, &arg_children_max); + if (r < 0) + log_warning("Invalid udev.children-max ignored: %s", opt + 18); } else if (startswith(opt, "udev.exec-delay=")) { - arg_exec_delay = strtoul(opt + 16, NULL, 0); + r = safe_atoi(opt + 16, &arg_exec_delay); + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", opt + 16); } else if (startswith(opt, "udev.event-timeout=")) { - arg_event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC; + r = safe_atou64(opt + 16, &arg_event_timeout_usec); + if (r < 0) { + log_warning("Invalid udev.event-timeout ignored: %s", opt + 16); + break; + } + arg_event_timeout_usec *= USEC_PER_SEC; arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; } @@ -1031,6 +1040,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argv); while ((c = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL)) >= 0) { + int r; switch (c) { @@ -1038,14 +1048,23 @@ static int parse_argv(int argc, char *argv[]) { arg_daemonize = true; break; case 'c': - arg_children_max = strtoul(optarg, NULL, 0); + r = safe_atoi(optarg, &arg_children_max); + if (r < 0) + log_warning("Invalid --children-max ignored: %s", optarg); break; case 'e': - arg_exec_delay = strtoul(optarg, NULL, 0); + r = safe_atoi(optarg, &arg_exec_delay); + if (r < 0) + log_warning("Invalid --exec-delay ignored: %s", optarg); break; case 't': - arg_event_timeout_usec = strtoul(optarg, NULL, 0) * USEC_PER_SEC; - arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; + r = safe_atou64(optarg, &arg_event_timeout_usec); + if (r < 0) + log_warning("Invalig --event-timeout ignored: %s", optarg); + else { + arg_event_timeout_usec *= USEC_PER_SEC; + arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; + } break; case 'D': arg_debug = true; @@ -1085,7 +1104,11 @@ int main(int argc, char *argv[]) { int fd_ctrl = -1; int fd_netlink = -1; int fd_worker = -1; - struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; + struct epoll_event ep_ctrl = { .events = EPOLLIN }; + struct epoll_event ep_inotify = { .events = EPOLLIN }; + struct epoll_event ep_signal = { .events = EPOLLIN }; + struct epoll_event ep_netlink = { .events = EPOLLIN }; + struct epoll_event ep_worker = { .events = EPOLLIN }; struct udev_ctrl_connection *ctrl_conn = NULL; int rc = 1, r; @@ -1100,9 +1123,6 @@ int main(int argc, char *argv[]) { udev_set_log_fn(udev, udev_main_log); log_set_max_level(udev_get_log_priority(udev)); - log_debug("version %s", VERSION); - label_init("/dev"); - r = parse_argv(argc, argv); if (r <= 0) goto exit; @@ -1119,6 +1139,8 @@ int main(int argc, char *argv[]) { goto exit; } + label_init("/dev"); + /* set umask before creating any file/directory */ chdir("/"); umask(022); @@ -1196,6 +1218,20 @@ int main(int argc, char *argv[]) { udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); + log_info("starting version " VERSION "\n"); + + udev_builtin_init(udev); + + rules = udev_rules_new(udev, arg_resolve_names); + if (rules == NULL) { + log_error("error reading rules"); + goto exit; + } + + rc = udev_rules_apply_static_dev_perms(rules); + if (rc < 0) + log_error("failed to apply permissions on static device nodes - %s", strerror(-rc)); + if (arg_daemonize) { pid_t pid; @@ -1219,19 +1255,19 @@ int main(int argc, char *argv[]) { sd_notify(1, "READY=1"); } - log_info("starting version " VERSION "\n"); + if (arg_children_max <= 0) { + cpu_set_t cpu_set; - if (!arg_debug) { - int fd; + arg_children_max = 8; - fd = open("/dev/null", O_RDWR); - if (fd >= 0) { - dup2(fd, STDIN_FILENO); - dup2(fd, STDOUT_FILENO); - dup2(fd, STDERR_FILENO); - close(fd); + if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { + arg_children_max += CPU_COUNT(&cpu_set) * 2; } } + log_debug("set children_max to %u", arg_children_max); + + udev_list_node_init(&event_list); + udev_list_node_init(&worker_list); fd_inotify = udev_watch_init(udev); if (fd_inotify < 0) { @@ -1259,32 +1295,10 @@ int main(int argc, char *argv[]) { } fd_worker = worker_watch[READ_END]; - udev_builtin_init(udev); - - rules = udev_rules_new(udev, arg_resolve_names); - if (rules == NULL) { - log_error("error reading rules"); - goto exit; - } - - memzero(&ep_ctrl, sizeof(struct epoll_event)); - ep_ctrl.events = EPOLLIN; ep_ctrl.data.fd = fd_ctrl; - - memzero(&ep_inotify, sizeof(struct epoll_event)); - ep_inotify.events = EPOLLIN; ep_inotify.data.fd = fd_inotify; - - memzero(&ep_signal, sizeof(struct epoll_event)); - ep_signal.events = EPOLLIN; ep_signal.data.fd = fd_signal; - - memzero(&ep_netlink, sizeof(struct epoll_event)); - ep_netlink.events = EPOLLIN; ep_netlink.data.fd = fd_netlink; - - memzero(&ep_worker, sizeof(struct epoll_event)); - ep_worker.events = EPOLLIN; ep_worker.data.fd = fd_worker; fd_ep = epoll_create1(EPOLL_CLOEXEC); @@ -1301,24 +1315,6 @@ int main(int argc, char *argv[]) { goto exit; } - if (arg_children_max <= 0) { - cpu_set_t cpu_set; - - arg_children_max = 8; - - if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - arg_children_max += CPU_COUNT(&cpu_set) * 2; - } - } - log_debug("set children_max to %u", arg_children_max); - - rc = udev_rules_apply_static_dev_perms(rules); - if (rc < 0) - log_error("failed to apply permissions on static device nodes - %s", strerror(-rc)); - - udev_list_node_init(&event_list); - udev_list_node_init(&worker_list); - for (;;) { static usec_t last_usec; struct epoll_event ev[8];