X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=a6258e714ac0d5eb62763133ce293777e37ac9d0;hp=e54bfec3b347e60f1f1f38956b2af1cafa5d0599;hb=ff49bc3212cb07d850dcfd59940539773a0be26f;hpb=671174136525ddf208cdbe75d6d6bd159afa961f diff --git a/src/udev/udevd.c b/src/udev/udevd.c index e54bfec3b..a6258e714 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -54,14 +54,6 @@ #include "dev-setup.h" #include "fileio.h" -static bool debug; - -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; @@ -72,14 +64,18 @@ static int fd_inotify = -1; static bool stop_exec_queue; static bool reload; static int children; -static int children_max; -static int exec_delay; -static usec_t event_timeout_usec = 180 * USEC_PER_SEC; -static usec_t event_timeout_warn_usec = 180 * USEC_PER_SEC / 3; +static bool arg_debug = false; +static int arg_daemonize = false; +static int arg_resolve_names = 1; +static int arg_children_max; +static int arg_exec_delay; +static usec_t arg_event_timeout_usec = 180 * USEC_PER_SEC; +static usec_t arg_event_timeout_warn_usec = 180 * USEC_PER_SEC / 3; 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 { @@ -274,8 +270,8 @@ static void worker_new(struct event *event) { /* needed for SIGCHLD/SIGTERM in spawn() */ udev_event->fd_signal = fd_signal; - if (exec_delay > 0) - udev_event->exec_delay = exec_delay; + if (arg_exec_delay > 0) + udev_event->exec_delay = arg_exec_delay; /* * Take a shared lock on the device node; this establishes @@ -309,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, event_timeout_usec, 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, event_timeout_usec, 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); @@ -441,8 +443,8 @@ static void event_run(struct event *event) { return; } - if (children >= children_max) { - if (children_max > 1) + if (children >= arg_children_max) { + if (arg_children_max > 1) log_debug("maximum number (%i) of children reached", children); return; } @@ -643,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); } @@ -676,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); @@ -692,7 +693,7 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) { i = udev_ctrl_get_set_children_max(ctrl_msg); if (i >= 0) { log_debug("udevd message (SET_MAX_CHILDREN) received, children_max=%i", i); - children_max = i; + arg_children_max = i; } if (udev_ctrl_get_ping(ctrl_msg) > 0) @@ -948,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 @@ -960,13 +961,13 @@ static void kernel_cmdline_options(struct udev *udev) { int r; r = proc_cmdline(&line); - if (r < 0) - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - if (r <= 0) + if (r < 0) { + log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m"); return; + } FOREACH_WORD_QUOTED(word, l, line, state) { - char *s, *opt; + char *s, *opt, *value; s = strndup(word, l); if (!s) @@ -978,139 +979,187 @@ 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=")) { - children_max = strtoul(opt + 18, NULL, 0); - } else if (startswith(opt, "udev.exec-delay=")) { - exec_delay = strtoul(opt + 16, NULL, 0); - } else if (startswith(opt, "udev.event-timeout=")) { - event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC; - event_timeout_warn_usec = (event_timeout_usec / 3) ? : 1; + } 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; } free(s); } } -int main(int argc, char *argv[]) { - struct udev *udev; - sigset_t mask; - int daemonize = false; - int resolve_names = 1; +static void help(void) { + printf("%s [OPTIONS...]\n\n" + "Manages devices.\n\n" + " --daemon\n" + " --debug\n" + " --children-max=\n" + " --exec-delay=\n" + " --event-timeout=\n" + " --resolve-names=early|late|never\n" + " --version\n" + " --help\n" + , program_invocation_short_name); +} + +static int parse_argv(int argc, char *argv[]) { static const struct option options[] = { - { "daemon", no_argument, NULL, 'd' }, - { "debug", no_argument, NULL, 'D' }, - { "children-max", required_argument, NULL, 'c' }, - { "exec-delay", required_argument, NULL, 'e' }, - { "event-timeout", required_argument, NULL, 't' }, - { "resolve-names", required_argument, NULL, 'N' }, - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'V' }, + { "daemon", no_argument, NULL, 'd' }, + { "debug", no_argument, NULL, 'D' }, + { "children-max", required_argument, NULL, 'c' }, + { "exec-delay", required_argument, NULL, 'e' }, + { "event-timeout", required_argument, NULL, 't' }, + { "resolve-names", required_argument, NULL, 'N' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, {} }; - 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 udev_ctrl_connection *ctrl_conn = NULL; - int rc = 1; - udev = udev_new(); - if (udev == NULL) - goto exit; + int c; - log_set_target(LOG_TARGET_AUTO); - 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"); + assert(argc >= 0); + assert(argv); - for (;;) { - int option; + while ((c = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL)) >= 0) { + int r; - option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL); - if (option == -1) - break; + switch (c) { - switch (option) { case 'd': - daemonize = true; + arg_daemonize = true; break; case 'c': - 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': - 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': - event_timeout_usec = strtoul(optarg, NULL, 0) * USEC_PER_SEC; - event_timeout_warn_usec = (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': - debug = true; - log_set_max_level(LOG_DEBUG); - udev_set_log_priority(udev, LOG_DEBUG); + arg_debug = true; break; case 'N': if (streq(optarg, "early")) { - resolve_names = 1; + arg_resolve_names = 1; } else if (streq(optarg, "late")) { - resolve_names = 0; + arg_resolve_names = 0; } else if (streq(optarg, "never")) { - resolve_names = -1; + arg_resolve_names = -1; } else { - fprintf(stderr, "resolve-names must be early, late or never\n"); log_error("resolve-names must be early, late or never"); - goto exit; + return 0; } break; case 'h': - printf("Usage: udevd OPTIONS\n" - " --daemon\n" - " --debug\n" - " --children-max=\n" - " --exec-delay=\n" - " --event-timeout=\n" - " --resolve-names=early|late|never\n" - " --version\n" - " --help\n" - "\n"); - goto exit; + help(); + return 0; case 'V': printf("%s\n", VERSION); - goto exit; + return 0; + case '?': + return -EINVAL; default: - goto exit; + assert_not_reached("Unhandled option"); + } } + return 1; +} + +int main(int argc, char *argv[]) { + struct udev *udev; + sigset_t mask; + int fd_ctrl = -1; + int fd_netlink = -1; + int fd_worker = -1; + 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; + + udev = udev_new(); + if (udev == NULL) + goto exit; + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + r = parse_argv(argc, argv); + if (r <= 0) + goto exit; + kernel_cmdline_options(udev); + if (arg_debug) + log_set_max_level(LOG_DEBUG); + if (getuid() != 0) { - fprintf(stderr, "root privileges required\n"); log_error("root privileges required"); goto exit; } + r = mac_selinux_init("/dev"); + if (r < 0) { + log_error_errno(r, "could not initialize labelling: %m"); + 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); /* before opening new files, make sure std{in,out,err} fds are in a sane state */ - if (daemonize) { + if (arg_daemonize) { int fd; fd = open("/dev/null", O_RDWR); @@ -1122,7 +1171,6 @@ int main(int argc, char *argv[]) { if (fd > STDERR_FILENO) close(fd); } else { - fprintf(stderr, "cannot open /dev/null\n"); log_error("cannot open /dev/null"); } } @@ -1150,7 +1198,6 @@ int main(int argc, char *argv[]) { /* open control and netlink socket */ udev_ctrl = udev_ctrl_new(udev); if (udev_ctrl == NULL) { - fprintf(stderr, "error initializing udev control socket"); log_error("error initializing udev control socket"); rc = 1; goto exit; @@ -1159,7 +1206,6 @@ int main(int argc, char *argv[]) { monitor = udev_monitor_new_from_netlink(udev, "kernel"); if (monitor == NULL) { - fprintf(stderr, "error initializing netlink socket\n"); log_error("error initializing netlink socket"); rc = 3; goto exit; @@ -1168,14 +1214,12 @@ int main(int argc, char *argv[]) { } if (udev_monitor_enable_receiving(monitor) < 0) { - fprintf(stderr, "error binding netlink socket\n"); log_error("error binding netlink socket"); rc = 3; goto exit; } if (udev_ctrl_enable_receiving(udev_ctrl) < 0) { - fprintf(stderr, "error binding udev control socket\n"); log_error("error binding udev control socket"); rc = 1; goto exit; @@ -1183,7 +1227,21 @@ int main(int argc, char *argv[]) { udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); - if (daemonize) { + log_info("starting version " VERSION); + + 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_errno(rc, "failed to apply permissions on static device nodes - %m"); + + if (arg_daemonize) { pid_t pid; pid = fork(); @@ -1206,23 +1264,22 @@ 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 (!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) { - fprintf(stderr, "error initializing inotify\n"); log_error("error initializing inotify"); rc = 4; goto exit; @@ -1234,7 +1291,6 @@ int main(int argc, char *argv[]) { sigprocmask(SIG_SETMASK, &mask, &sigmask_orig); fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC); if (fd_signal < 0) { - fprintf(stderr, "error creating signalfd\n"); log_error("error creating signalfd"); rc = 5; goto exit; @@ -1242,39 +1298,16 @@ int main(int argc, char *argv[]) { /* unnamed socket from workers to the main daemon */ if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) { - fprintf(stderr, "error creating socketpair\n"); log_error("error creating socketpair"); rc = 6; goto exit; } fd_worker = worker_watch[READ_END]; - udev_builtin_init(udev); - - rules = udev_rules_new(udev, 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); @@ -1291,24 +1324,6 @@ int main(int argc, char *argv[]) { goto exit; } - if (children_max <= 0) { - cpu_set_t cpu_set; - - children_max = 8; - - if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - children_max += CPU_COUNT(&cpu_set) * 2; - } - } - log_debug("set children_max to %u", 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]; @@ -1396,8 +1411,8 @@ int main(int argc, char *argv[]) { ts = now(CLOCK_MONOTONIC); - if ((ts - worker->event_start_usec) > event_timeout_warn_usec) { - if ((ts - worker->event_start_usec) > event_timeout_usec) { + if ((ts - worker->event_start_usec) > arg_event_timeout_warn_usec) { + if ((ts - worker->event_start_usec) > arg_event_timeout_usec) { log_error("worker [%u] %s timeout; kill it", worker->pid, worker->event->devpath); kill(worker->pid, SIGKILL); worker->state = WORKER_KILLED; @@ -1468,7 +1483,7 @@ int main(int argc, char *argv[]) { if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) { udev_builtin_init(udev); if (rules == NULL) - rules = udev_rules_new(udev, resolve_names); + rules = udev_rules_new(udev, arg_resolve_names); if (rules != NULL) event_queue_start(udev); } @@ -1523,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;