X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=3c3de76f3438996c62c4614bec2642f6d5c21009;hb=79008bddf679a5e0900369950eb346c9fa687107;hp=e90d9dacb056fca6c374786ba3dadfa50caf09f1;hpb=5c67cf2774a8b964f4d7cd92a4c447da81ac6087;p=elogind.git diff --git a/src/udev/udevd.c b/src/udev/udevd.c index e90d9dacb..3c3de76f3 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -54,12 +54,6 @@ #include "dev-setup.h" #include "fileio.h" -void udev_main_log(struct udev *udev, int priority, - const char *file, int line, const char *fn, - const char *format, va_list args) { - log_metav(priority, file, line, fn, format, args); -} - static struct udev_rules *rules; static struct udev_ctrl *udev_ctrl; static struct udev_monitor *monitor; @@ -81,6 +75,7 @@ static sigset_t sigmask_orig; static UDEV_LIST(event_list); static UDEV_LIST(worker_list); static char *udev_cgroup; +static struct udev_list properties_list; static bool udev_exit; enum event_state { @@ -310,9 +305,15 @@ static void worker_new(struct event *event) { udev_event->rtnl = rtnl; /* apply rules, create node, symlinks */ - udev_event_execute_rules(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, rules, &sigmask_orig); + udev_event_execute_rules(udev_event, + arg_event_timeout_usec, arg_event_timeout_warn_usec, + &properties_list, + rules, + &sigmask_orig); - udev_event_execute_run(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, &sigmask_orig); + udev_event_execute_run(udev_event, + arg_event_timeout_usec, arg_event_timeout_warn_usec, + &sigmask_orig); /* in case rtnl was initialized */ rtnl = sd_rtnl_ref(udev_event->rtnl); @@ -644,7 +645,6 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) { if (i >= 0) { log_debug("udevd message (SET_LOG_LEVEL) received, log_priority=%i", i); log_set_max_level(i); - udev_set_log_priority(udev, i); worker_kill(udev); } @@ -677,10 +677,10 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) { val = &val[1]; if (val[0] == '\0') { log_debug("udevd message (ENV) received, unset '%s'", key); - udev_add_property(udev, key, NULL); + udev_list_entry_add(&properties_list, key, NULL); } else { log_debug("udevd message (ENV) received, set '%s=%s'", key, val); - udev_add_property(udev, key, val); + udev_list_entry_add(&properties_list, key, val); } } else { log_error("wrong key format '%s'", key); @@ -949,7 +949,7 @@ static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) { } /* - * read the kernel commandline, in case we need to get into debug mode + * read the kernel command line, in case we need to get into debug mode * udev.log-priority= syslog priority * udev.children-max= events are fully serialized if set to 1 * udev.exec-delay= delay execution of every executed program @@ -961,13 +961,13 @@ static void kernel_cmdline_options(struct udev *udev) { int r; r = proc_cmdline(&line); - if (r < 0) + if (r < 0) { log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) return; + } FOREACH_WORD_QUOTED(word, l, line, state) { - char *s, *opt; + char *s, *opt, *value; s = strndup(word, l); if (!s) @@ -979,18 +979,26 @@ static void kernel_cmdline_options(struct udev *udev) { else opt = s; - if (startswith(opt, "udev.log-priority=")) { + if ((value = startswith(opt, "udev.log-priority="))) { int prio; - prio = util_log_priority(opt + 18); + prio = util_log_priority(value); 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); - } else if (startswith(opt, "udev.exec-delay=")) { - arg_exec_delay = strtoul(opt + 16, NULL, 0); - } else if (startswith(opt, "udev.event-timeout=")) { - arg_event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC; + } else if ((value = startswith(opt, "udev.children-max="))) { + r = safe_atoi(value, &arg_children_max); + if (r < 0) + log_warning("Invalid udev.children-max ignored: %s", value); + } else if ((value = startswith(opt, "udev.exec-delay="))) { + r = safe_atoi(value, &arg_exec_delay); + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", value); + } else if ((value = startswith(opt, "udev.event-timeout="))) { + r = safe_atou64(value, &arg_event_timeout_usec); + if (r < 0) { + log_warning("Invalid udev.event-timeout ignored: %s", value); + break; + } + arg_event_timeout_usec *= USEC_PER_SEC; arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; } @@ -1031,6 +1039,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 +1047,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("Invalid --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 +1103,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; @@ -1097,33 +1119,42 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); - 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; kernel_cmdline_options(udev); - if (arg_debug) { + if (arg_debug) log_set_max_level(LOG_DEBUG); - udev_set_log_priority(udev, LOG_DEBUG); - } if (getuid() != 0) { log_error("root privileges required"); goto exit; } + r = mac_selinux_init("/dev"); + if (r < 0) { + log_error("could not initialize labelling: %s", strerror(-r)); + goto exit; + } + /* set umask before creating any file/directory */ - chdir("/"); + r = chdir("/"); + if (r < 0) { + log_error("could not change dir to /: %m"); + goto exit; + } + umask(022); - mkdir("/run/udev", 0755); + udev_list_init(udev, &properties_list, true); + + r = mkdir("/run/udev", 0755); + if (r < 0 && errno != EEXIST) { + log_error("could not create /run/udev: %m"); + goto exit; + } dev_setup(NULL); @@ -1196,6 +1227,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,7 +1264,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; + + 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); + + udev_list_node_init(&event_list); + udev_list_node_init(&worker_list); fd_inotify = udev_watch_init(udev); if (fd_inotify < 0) { @@ -1247,32 +1304,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); @@ -1289,24 +1324,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]; @@ -1521,7 +1538,8 @@ exit_daemonize: udev_monitor_unref(monitor); udev_ctrl_connection_unref(ctrl_conn); udev_ctrl_unref(udev_ctrl); - label_finish(); + udev_list_cleanup(&properties_list); + mac_selinux_finish(); udev_unref(udev); log_close(); return rc;