X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=8a352e1eb9f52b07f4d9b6cd71d09e16e94eb158;hp=86905923be89b7edb446d59d78da230d565f6389;hb=f5f0c34f6dc32769fd788560ce0d0cac843872b2;hpb=ff3e4bed21aaff673284f2e024da26c1e39cfda6 diff --git a/udevd.c b/udevd.c index 86905923b..8a352e1eb 100644 --- a/udevd.c +++ b/udevd.c @@ -39,18 +39,14 @@ #include #include #include +#include #include -#include "list.h" -#include "udev_libc_wrapper.h" #include "udev.h" -#include "udev_version.h" #include "udev_rules.h" -#include "udev_utils.h" #include "udevd.h" -#include "logging.h" -struct udev_rules rules; +static struct udev_rules rules; static int udevd_sock; static int uevent_netlink_sock; static int inotify_fd; @@ -93,8 +89,7 @@ static void asmlinkage udev_event_sig_handler(int signum) static int udev_event_process(struct uevent_msg *msg) { struct sigaction act; - struct udevice udev; - struct name_entry *name_loop; + struct udevice *udev; int i; int retval; @@ -108,37 +103,134 @@ static int udev_event_process(struct uevent_msg *msg) /* trigger timeout to prevent hanging processes */ alarm(UDEV_ALARM_TIMEOUT); - /* reconstruct env from message */ + /* reconstruct event environment from message */ for (i = 0; msg->envp[i]; i++) putenv(msg->envp[i]); - udev_init_device(&udev, msg->devpath, msg->subsystem, msg->action); - retval = udev_process_event(&rules, &udev); + udev = udev_device_init(); + if (udev == NULL) + return -1; + strlcpy(udev->action, msg->action, sizeof(udev->action)); + sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem); + udev->devt = msg->devt; + + retval = udev_device_event(&rules, udev); /* run programs collected by RUN-key*/ - if (!retval) { - list_for_each_entry(name_loop, &udev.run_list, node) { + if (retval == 0) { + struct name_entry *name_loop; + + list_for_each_entry(name_loop, &udev->run_list, node) { if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action); - else - run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO)); + else { + char program[PATH_SIZE]; + + strlcpy(program, name_loop->name, sizeof(program)); + apply_format(udev, program, sizeof(program)); + if (run_program(program, udev->dev->subsystem, NULL, 0, NULL, + (udev_log_priority >= LOG_INFO))) + retval = -1; + } } } - udev_cleanup_device(&udev); + udev_device_cleanup(udev); + return retval; +} - return 0; +enum event_state { + EVENT_QUEUED, + EVENT_FINISHED, + EVENT_FAILED, +}; + +static void export_event_state(struct uevent_msg *msg, enum event_state state) +{ + char filename[PATH_SIZE]; + char filename_failed[PATH_SIZE]; + char target[PATH_SIZE]; + size_t start, end, i; + struct uevent_msg *loop_msg; + + /* add location of queue files */ + strlcpy(filename, udev_root, sizeof(filename)); + strlcat(filename, "/", sizeof(filename)); + start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename)); + end = strlcat(filename, msg->devpath, sizeof(filename)); + if (end > sizeof(filename)) + end = sizeof(filename); + + /* replace '/' to transform path into a filename */ + for (i = start+1; i < end; i++) + if (filename[i] == '/') + filename[i] = PATH_TO_NAME_CHAR; + + /* add location of failed files */ + strlcpy(filename_failed, udev_root, sizeof(filename_failed)); + strlcat(filename_failed, "/", sizeof(filename_failed)); + start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed)); + end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed)); + if (end > sizeof(filename_failed)) + end = sizeof(filename_failed); + + /* replace '/' to transform path into a filename */ + for (i = start+1; i < end; i++) + if (filename_failed[i] == '/') + filename_failed[i] = PATH_TO_NAME_CHAR; + + switch (state) { + case EVENT_QUEUED: + unlink(filename_failed); + delete_path(filename_failed); + + strlcpy(target, sysfs_path, sizeof(target)); + strlcat(target, msg->devpath, sizeof(target)); + create_path(filename); + symlink(target, filename); + return; + case EVENT_FINISHED: + case EVENT_FAILED: + unlink(filename_failed); + delete_path(filename_failed); + + /* don't remove, if events for the same path are still pending */ + list_for_each_entry(loop_msg, &running_list, node) + if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0) + return; + + /* move failed events to the failed directory */ + if (state == EVENT_FAILED) { + create_path(filename_failed); + rename(filename, filename_failed); + } else { + unlink(filename); + } + + /* clean up the queue directory */ + delete_path(filename); + + return; + } } static void msg_queue_delete(struct uevent_msg *msg) { list_del(&msg->node); + + /* mark as failed, if add event returns non-zero */ + if (msg->exitstatus && strcmp(msg->action, "add") == 0) + export_event_state(msg, EVENT_FAILED); + else + export_event_state(msg, EVENT_FINISHED); + free(msg); } static void udev_event_run(struct uevent_msg *msg) { pid_t pid; + int retval; pid = fork(); switch (pid) { @@ -154,10 +246,12 @@ static void udev_event_run(struct uevent_msg *msg) logging_init("udevd-event"); setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY); - udev_event_process(msg); + retval = udev_event_process(msg); info("seq %llu finished", msg->seqnum); logging_close(); + if (retval) + exit(1); exit(0); case -1: err("fork of child failed: %s", strerror(errno)); @@ -175,6 +269,8 @@ static void msg_queue_insert(struct uevent_msg *msg) { msg->queue_time = time(NULL); + export_event_state(msg, EVENT_QUEUED); + /* run all events with a timeout set immediately */ if (msg->timeout != 0) { list_add_tail(&msg->node, &running_list); @@ -312,16 +408,11 @@ static int running_with_devpath(struct uevent_msg *msg, int limit) struct uevent_msg *loop_msg; int childs_count = 0; - if (msg->devpath == NULL) - return 0; - list_for_each_entry(loop_msg, &running_list, node) { if (limit && childs_count++ > limit) { dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count); return 1; } - if (loop_msg->devpath == NULL) - continue; /* return running parent/child device event */ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) { @@ -430,6 +521,12 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size) msg->envp[i++] = "UDEVD_EVENT=1"; msg->envp[i] = NULL; + if (msg->devpath == NULL || msg->action == NULL) { + info("DEVPATH or ACTION missing, ignore message"); + free(msg); + return NULL; + } + return msg; } @@ -460,7 +557,7 @@ static struct uevent_msg *get_udevd_msg(void) size = recvmsg(udevd_sock, &smsg, 0); if (size < 0) { if (errno != EINTR) - err("unable to receive udevd message: %s", strerror(errno)); + err("unable to receive user udevd message: %s", strerror(errno)); return NULL; } cmsg = CMSG_FIRSTHDR(&smsg); @@ -529,13 +626,13 @@ static struct uevent_msg *get_netlink_msg(void) struct uevent_msg *msg; int bufpos; ssize_t size; - static char buffer[UEVENT_BUFFER_SIZE + 512]; + static char buffer[UEVENT_BUFFER_SIZE+512]; char *pos; size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0); if (size < 0) { if (errno != EINTR) - err("unable to receive udevd message: %s", strerror(errno)); + err("unable to receive kernel netlink message: %s", strerror(errno)); return NULL; } @@ -595,14 +692,16 @@ static void asmlinkage sig_handler(int signum) write(signal_pipe[WRITE_END], "", 1); } -static void udev_done(int pid) +static void udev_done(int pid, int exitstatus) { /* find msg associated with pid and delete it */ struct uevent_msg *msg; list_for_each_entry(msg, &running_list, node) { if (msg->pid == pid) { - info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, time(NULL) - msg->queue_time); + info("seq %llu, pid [%d] exit with %i, %ld seconds old", msg->seqnum, msg->pid, + exitstatus, time(NULL) - msg->queue_time); + msg->exitstatus = exitstatus; msg_queue_delete(msg); /* there may be events waiting with the same devpath */ @@ -615,12 +714,19 @@ static void udev_done(int pid) static void reap_sigchilds(void) { pid_t pid; + int status; while (1) { - pid = waitpid(-1, NULL, WNOHANG); + pid = waitpid(-1, &status, WNOHANG); if (pid <= 0) break; - udev_done(pid); + if (WIFEXITED(status)) + status = WEXITSTATUS(status); + else if (WIFSIGNALED(status)) + status = WTERMSIG(status) + 128; + else + status = 0; + udev_done(pid, status); } } @@ -719,7 +825,7 @@ int main(int argc, char *argv[], char *envp[]) if (fd < 0) err("fatal, could not open /dev/null: %s", strerror(errno)); - udev_init_config(); + udev_config_init(); dbg("version %s", UDEV_VERSION); if (getuid() != 0) { @@ -743,10 +849,10 @@ int main(int argc, char *argv[], char *envp[]) /* init sockets to receive events */ if (init_udevd_socket() < 0) { if (errno == EADDRINUSE) { - dbg("another udevd running, exit"); + err("another udevd running, exit"); rc = 1; } else { - dbg("error initializing udevd socket: %s", strerror(errno)); + err("error initializing udevd socket: %s", strerror(errno)); rc = 2; } goto exit; @@ -759,6 +865,7 @@ int main(int argc, char *argv[], char *envp[]) } /* parse the rules and keep it in memory */ + sysfs_init(); udev_rules_init(&rules, 1); if (daemonize) { @@ -872,20 +979,15 @@ int main(int argc, char *argv[], char *envp[]) fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL); if (fdcount < 0) { if (errno != EINTR) - dbg("error in select: %s", strerror(errno)); + err("error in select: %s", strerror(errno)); continue; } /* get user socket message */ if (FD_ISSET(udevd_sock, &readfds)) { msg = get_udevd_msg(); - if (msg) { - if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) { - info("skip non-kernel message with SEQNUM"); - free(msg); - } else - msg_queue_insert(msg); - } + if (msg) + msg_queue_insert(msg); } /* get kernel netlink message */ @@ -925,7 +1027,7 @@ int main(int argc, char *argv[], char *envp[]) /* rules changed, set by inotify or a signal*/ if (reload_config) { reload_config = 0; - udev_rules_close(&rules); + udev_rules_cleanup(&rules); udev_rules_init(&rules, 1); } @@ -943,7 +1045,8 @@ int main(int argc, char *argv[], char *envp[]) } exit: - udev_rules_close(&rules); + udev_rules_cleanup(&rules); + sysfs_cleanup(); if (signal_pipe[READ_END] > 0) close(signal_pipe[READ_END]);