X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=7786ae6b8debba13d8c0d3ee76a44fe6aafa82e0;hp=7dedf078f3ef91ebea9963830c0845e95e0eedae;hb=6056d9b3400fe0349d86636cbbf93f069bb5639a;hpb=274da2b23d37f2dd174f765e9cfcc485e4a5a898 diff --git a/udevd.c b/udevd.c index 7dedf078f..7786ae6b8 100644 --- a/udevd.c +++ b/udevd.c @@ -76,17 +76,14 @@ void log_message(int priority, const char *format, ...) if (priority > udev_log_priority) return; + va_start(args, format); if (verbose) { printf("[%d] ", (int) getpid()); - va_start(args, format); vprintf(format, args); - va_end(args); printf("\n"); - } else { - va_start(args, format); + } else vsyslog(priority, format, args); - va_end(args); - } + va_end(args); } #endif @@ -130,6 +127,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg) return -1; strlcpy(udev->action, msg->action, sizeof(udev->action)); sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver); + udev->devpath_old = msg->devpath_old; udev->devt = msg->devt; retval = udev_device_event(&rules, udev); @@ -153,66 +151,67 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st char filename[PATH_SIZE]; char filename_failed[PATH_SIZE]; size_t start; - struct udevd_uevent_msg *loop_msg; - int fd; - /* add location of queue files */ - strlcpy(filename, udev_root, sizeof(filename)); - strlcat(filename, "/", sizeof(filename)); - start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename)); - strlcat(filename, msg->devpath, sizeof(filename)); - path_encode(&filename[start], sizeof(filename) - start); + /* location of queue file */ + snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum); - /* add location of failed files */ + /* location of failed file */ strlcpy(filename_failed, udev_root, sizeof(filename_failed)); strlcat(filename_failed, "/", sizeof(filename_failed)); start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed)); strlcat(filename_failed, msg->devpath, sizeof(filename_failed)); - path_encode(&filename_failed[start], sizeof(filename) - start); + path_encode(&filename_failed[start], sizeof(filename_failed) - start); switch (state) { case EVENT_QUEUED: unlink(filename_failed); delete_path(filename_failed); + create_path(filename); - fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); - if (fd > 0) - close(fd); - return; + selinux_setfscreatecon(filename, NULL, S_IFLNK); + symlink(msg->devpath, filename); + selinux_resetfscreatecon(); + break; 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; - - list_for_each_entry(loop_msg, &exec_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); + if (msg->devpath_old != NULL) { + /* "move" event - rename failed file to current name, do not delete failed */ + char filename_failed_old[PATH_SIZE]; + + strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old)); + strlcat(filename_failed_old, "/", sizeof(filename_failed_old)); + start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old)); + strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old)); + path_encode(&filename_failed_old[start], sizeof(filename) - start); + + if (rename(filename_failed_old, filename_failed) == 0) + info("renamed devpath, moved failed state of '%s' to %s'", + msg->devpath_old, msg->devpath); } else { - unlink(filename); + unlink(filename_failed); + delete_path(filename_failed); } - /* clean up the queue directory */ + unlink(filename); delete_path(filename); + break; + case EVENT_FAILED: + /* move failed event to the failed directory */ + create_path(filename_failed); + rename(filename, filename_failed); - return; + /* clean up possibly empty queue directory */ + delete_path(filename); + break; } + + return; } static void msg_queue_delete(struct udevd_uevent_msg *msg) { list_del(&msg->node); - /* mark as failed, if add event returns non-zero */ + /* mark as failed, if "add" event returns non-zero */ if (msg->exitstatus && strcmp(msg->action, "add") == 0) export_event_state(msg, EVENT_FAILED); else @@ -280,6 +279,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg) } export_event_state(msg, EVENT_QUEUED); + info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem); /* run one event after the other in debug mode */ if (debug_trace) { @@ -469,11 +469,24 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (loop_msg->seqnum >= msg->seqnum) break; + /* check our old name */ + if (msg->devpath_old != NULL) + if (strcmp(loop_msg->devpath , msg->devpath_old) == 0) + return 2; + /* check identical, parent, or child device event */ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) { dbg("%llu, device event still pending %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 2; + return 3; + } + + /* check for our major:minor number */ + if (msg->devt && loop_msg->devt == msg->devt && + strcmp(msg->subsystem, loop_msg->subsystem) == 0) { + dbg("%llu, device event still pending %llu (%d:%d)", msg->seqnum, + loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt)); + return 4; } /* check physical device event (special case of parent) */ @@ -481,22 +494,35 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) { dbg("%llu, physical device event still pending %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 3; + return 5; } } - /* check runing-queue for still running events */ + /* check run queue for still running events */ list_for_each_entry(loop_msg, &running_list, node) { if (limit && childs_count++ > limit) { dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count); return 1; } + /* check our old name */ + if (msg->devpath_old != NULL) + if (strcmp(loop_msg->devpath , msg->devpath_old) == 0) + return 2; + /* check identical, parent, or child device event */ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) { dbg("%llu, device event still running %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 2; + return 3; + } + + /* check for our major:minor number */ + if (msg->devt && loop_msg->devt == msg->devt && + strcmp(msg->subsystem, loop_msg->subsystem) == 0) { + dbg("%llu, device event still running %llu (%d:%d)", msg->seqnum, + loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt)); + return 4; } /* check physical device event (special case of parent) */ @@ -504,7 +530,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) { dbg("%llu, physical device event still running %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 3; + return 5; } } return 0; @@ -588,6 +614,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz msg->driver = &key[7]; else if (strncmp(key, "SEQNUM=", 7) == 0) msg->seqnum = strtoull(&key[7], NULL, 10); + else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) + msg->devpath_old = &key[12]; else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) msg->physdevpath = &key[12]; else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0) @@ -836,7 +864,7 @@ static int init_udevd_socket(void) saddr.sun_family = AF_LOCAL; /* use abstract namespace for socket path */ strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH); - addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1; + addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]); udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0); if (udevd_sock == -1) { @@ -1090,6 +1118,14 @@ int main(int argc, char *argv[], char *envp[]) close(fd); } + fd = open("/dev/kmsg", O_WRONLY); + if (fd > 0) { + const char *str = "<6>udevd version " UDEV_VERSION " started\n"; + + write(fd, str, strlen(str)); + close(fd); + } + /* set signal handlers */ memset(&act, 0x00, sizeof(struct sigaction)); act.sa_handler = (void (*)(int)) sig_handler; @@ -1102,10 +1138,17 @@ int main(int argc, char *argv[], char *envp[]) /* watch rules directory */ inotify_fd = inotify_init(); - if (inotify_fd >= 0) + if (inotify_fd >= 0) { + char filename[PATH_MAX]; + inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); - else if (errno == ENOSYS) - err("the kernel does not support inotify, udevd can't monitor configuration file changes"); + + /* watch dynamic rules directory */ + strlcpy(filename, udev_root, sizeof(filename)); + strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename)); + inotify_add_watch(inotify_fd, filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); + } else if (errno == ENOSYS) + err("the kernel does not support inotify, udevd can't monitor rules file changes"); else err("inotify_init failed: %s", strerror(errno)); @@ -1190,12 +1233,12 @@ int main(int argc, char *argv[], char *envp[]) int nbytes; /* discard all possible events, we can just reload the config */ - if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes) { + if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes > 0) { char *buf; reload_config = 1; buf = malloc(nbytes); - if (!buf) { + if (buf == NULL) { err("error getting buffer for inotify, disable watching"); close(inotify_fd); inotify_fd = -1;