X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=68e3a75f33358b2a66c4f14cb8eabd3efe0a226e;hb=88f4b6485e2a551de55fd9d39aeef89debf3121c;hp=c2f2dd048b57a8e919628fb7d33d2f6c0583ee64;hpb=63f61c5cf639953aa38e025485919b0aa1c49b59;p=elogind.git diff --git a/udevd.c b/udevd.c index c2f2dd048..68e3a75f3 100644 --- a/udevd.c +++ b/udevd.c @@ -21,7 +21,6 @@ */ #include -#include #include #include #include @@ -31,12 +30,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include "list.h" #include "udev_libc_wrapper.h" @@ -48,6 +50,7 @@ /* global variables*/ static int udevsendsock; +static int ueventsock; static pid_t sid; static int pipefds[2]; @@ -69,20 +72,19 @@ static void reap_sigchilds(void); char *udev_bin; #ifdef USE_LOG -void log_message (int level, const char *format, ...) +void log_message (int priority, const char *format, ...) { - va_list args; + va_list args; + + if (priority > udev_log_priority) + return; va_start(args, format); - vsyslog(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif -#define msg_dump(msg) \ - dbg("msg_dump: sequence %llu, '%s', '%s', '%s'", \ - msg->seqnum, msg->action, msg->devpath, msg->subsystem); - static void msg_dump_queue(void) { #ifdef DEBUG @@ -112,6 +114,14 @@ static void msg_queue_insert(struct hotplug_msg *msg) return; } + /* don't delay messages with timeout set */ + if (msg->timeout) { + dbg("move seq %llu with timeout %u to exec queue", msg->seqnum, msg->timeout); + list_add(&msg->node, &exec_list); + run_exec_q = 1; + return; + } + /* sort message by sequence number into list */ list_for_each_entry_reverse(loop_msg, &msg_list, node) { if (loop_msg->seqnum < msg->seqnum) @@ -119,6 +129,7 @@ static void msg_queue_insert(struct hotplug_msg *msg) if (loop_msg->seqnum == msg->seqnum) { dbg("ignoring duplicate message seq %llu", msg->seqnum); + free(msg); return; } } @@ -137,7 +148,7 @@ static void msg_queue_insert(struct hotplug_msg *msg) } /* forks event and removes event from run queue when finished */ -static void udev_run(struct hotplug_msg *msg) +static void execute_udev(struct hotplug_msg *msg) { char *const argv[] = { "udev", msg->subsystem, NULL }; pid_t pid; @@ -146,16 +157,18 @@ static void udev_run(struct hotplug_msg *msg) switch (pid) { case 0: /* child */ + if (ueventsock != -1) + close(ueventsock); close(udevsendsock); logging_close(); setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY); execve(udev_bin, argv, msg->envp); - dbg("exec of child failed"); + err("exec of child failed"); _exit(1); break; case -1: - dbg("fork of child failed"); + err("fork of child failed"); run_queue_delete(msg); break; default: @@ -292,6 +305,10 @@ static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg) if (msg->devpath == NULL) return NULL; + /* skip any events with a timeout set */ + if (msg->timeout) + return NULL; + list_for_each_entry(loop_msg, &running_list, node) { if (loop_msg->devpath == NULL) continue; @@ -337,7 +354,7 @@ static void exec_queue_manager(void) if (!msg) { /* move event to run list */ list_move_tail(&loop_msg->node, &running_list); - udev_run(loop_msg); + execute_udev(loop_msg); running++; dbg("moved seq %llu to running list", loop_msg->seqnum); } else { @@ -404,13 +421,60 @@ recheck: } } +static struct hotplug_msg *get_msg_from_envbuf(const char *buf, int buf_size) +{ + int bufpos; + int i; + struct hotplug_msg *msg; + + msg = malloc(sizeof(struct hotplug_msg) + buf_size); + if (msg == NULL) + return NULL; + memset(msg, 0x00, sizeof(struct hotplug_msg) + buf_size); + + /* copy environment buffer and reconstruct envp */ + memcpy(msg->envbuf, buf, buf_size); + bufpos = 0; + for (i = 0; (bufpos < buf_size) && (i < HOTPLUG_NUM_ENVP-2); i++) { + int keylen; + char *key; + + key = &msg->envbuf[bufpos]; + keylen = strlen(key); + msg->envp[i] = key; + bufpos += keylen + 1; + dbg("add '%s' to msg.envp[%i]", msg->envp[i], i); + + /* remember some keys for further processing */ + if (strncmp(key, "ACTION=", 7) == 0) + msg->action = &key[7]; + + if (strncmp(key, "DEVPATH=", 8) == 0) + msg->devpath = &key[8]; + + if (strncmp(key, "SUBSYSTEM=", 10) == 0) + msg->subsystem = &key[10]; + + if (strncmp(key, "SEQNUM=", 7) == 0) + msg->seqnum = strtoull(&key[7], NULL, 10); + + if (strncmp(key, "PHYSDEVPATH=", 12) == 0) + msg->physdevpath = &key[12]; + + if (strncmp(key, "TIMEOUT=", 8) == 0) + msg->timeout = strtoull(&key[8], NULL, 10); + } + msg->envp[i++] = "UDEVD_EVENT=1"; + msg->envp[i] = NULL; + + return msg; +} + /* receive the udevsend message and do some sanity checks */ static struct hotplug_msg *get_udevsend_msg(void) { static struct udevsend_msg usend_msg; struct hotplug_msg *msg; - int bufpos; - int i; ssize_t size; struct msghdr smsg; struct cmsghdr *cmsg; @@ -439,59 +503,76 @@ static struct hotplug_msg *get_udevsend_msg(void) cred = (struct ucred *) CMSG_DATA(cmsg); if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) { - dbg("no sender credentials received, message ignored"); + info("no sender credentials received, message ignored"); return NULL; } if (cred->uid != 0) { - dbg("sender uid=%i, message ignored", cred->uid); + info("sender uid=%i, message ignored", cred->uid); return NULL; } if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) { - dbg("message magic '%s' doesn't match, ignore it", usend_msg.magic); + info("message magic '%s' doesn't match, ignore it", usend_msg.magic); return NULL; } envbuf_size = size - offsetof(struct udevsend_msg, envbuf); dbg("envbuf_size=%i", envbuf_size); - msg = malloc(sizeof(struct hotplug_msg) + envbuf_size); + msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size); if (msg == NULL) return NULL; - memset(msg, 0x00, sizeof(struct hotplug_msg) + envbuf_size); + return msg; +} - /* copy environment buffer and reconstruct envp */ - memcpy(msg->envbuf, usend_msg.envbuf, envbuf_size); - bufpos = 0; - for (i = 0; (bufpos < envbuf_size) && (i < HOTPLUG_NUM_ENVP-2); i++) { - int keylen; - char *key; +/* receive the kernel user event message and do some sanity checks */ +static struct hotplug_msg *get_uevent_msg(void) +{ + struct hotplug_msg *msg; + int bufpos; + ssize_t size; + static char buffer[HOTPLUG_BUFFER_SIZE + 512]; + char *pos; - key = &msg->envbuf[bufpos]; - keylen = strlen(key); - msg->envp[i] = key; - bufpos += keylen + 1; - dbg("add '%s' to msg.envp[%i]", msg->envp[i], i); + size = recv(ueventsock, &buffer, sizeof(buffer), 0); + if (size < 0) { + if (errno != EINTR) + dbg("unable to receive udevsend message"); + return NULL; + } - /* remember some keys for further processing */ - if (strncmp(key, "ACTION=", 7) == 0) - msg->action = &key[7]; + if ((size_t)size > sizeof(buffer)-1) + size = sizeof(buffer)-1; + buffer[size] = '\0'; + dbg("uevent_size=%i", size); - if (strncmp(key, "DEVPATH=", 8) == 0) - msg->devpath = &key[8]; + /* start of event payload */ + bufpos = strlen(buffer)+1; + msg = get_msg_from_envbuf(&buffer[bufpos], size-bufpos); + if (msg == NULL) + return NULL; - if (strncmp(key, "SUBSYSTEM=", 10) == 0) - msg->subsystem = &key[10]; + /* validate message */ + pos = strchr(buffer, '@'); + if (pos == NULL) { + dbg("invalid uevent '%s'", buffer); + free(msg); + return NULL; + } + pos[0] = '\0'; - if (strncmp(key, "SEQNUM=", 7) == 0) - msg->seqnum = strtoull(&key[7], NULL, 10); + if (msg->action == NULL) { + dbg("no ACTION in payload found, skip event '%s'", buffer); + free(msg); + return NULL; + } - if (strncmp(key, "PHYSDEVPATH=", 12) == 0) - msg->physdevpath = &key[12]; + if (strcmp(msg->action, buffer) != 0) { + dbg("ACTION in payload does not match uevent, skip event '%s'", buffer); + free(msg); + return NULL; } - msg->envp[i++] = "UDEVD_EVENT=1"; - msg->envp[i] = NULL; return msg; } @@ -589,14 +670,14 @@ static int init_udevsend_socket(void) udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0); if (udevsendsock == -1) { - dbg("error getting socket, %s", strerror(errno)); + err("error getting socket, %s", strerror(errno)); return -1; } /* the bind takes care of ensuring only one copy running */ retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen); if (retval < 0) { - dbg("bind failed, %s", strerror(errno)); + err("bind failed, %s", strerror(errno)); close(udevsendsock); return -1; } @@ -607,6 +688,34 @@ static int init_udevsend_socket(void) return 0; } +static int init_uevent_socket(void) +{ + struct sockaddr_nl snl; + int retval; + + memset(&snl, 0x00, sizeof(struct sockaddr_nl)); + snl.nl_family = AF_NETLINK; + snl.nl_pid = getpid(); + snl.nl_groups = 0xffffffff; + + ueventsock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT); + if (ueventsock == -1) { + dbg("error getting socket, %s", strerror(errno)); + return -1; + } + + retval = bind(ueventsock, (struct sockaddr *) &snl, + sizeof(struct sockaddr_nl)); + if (retval < 0) { + dbg("bind failed, %s", strerror(errno)); + close(ueventsock); + ueventsock = -1; + return -1; + } + + return 0; +} + int main(int argc, char *argv[], char *envp[]) { struct sysinfo info; @@ -616,12 +725,14 @@ int main(int argc, char *argv[], char *envp[]) struct sigaction act; fd_set readfds; const char *udevd_expected_seqnum; + int uevent_active = 0; logging_init("udevd"); + udev_init_config(); dbg("version %s", UDEV_VERSION); if (getuid() != 0) { - dbg("need to be root, exit"); + err("need to be root, exit"); goto exit; } @@ -635,7 +746,7 @@ int main(int argc, char *argv[], char *envp[]) dbg("damonized fork running"); break; case -1: - dbg("fork of daemon failed"); + err("fork of daemon failed"); goto exit; default: logging_close(); @@ -663,36 +774,36 @@ int main(int argc, char *argv[], char *envp[]) if (fd > 2) close(fd); } else - dbg("error opening /dev/null %s", strerror(errno)); + err("error opening /dev/null %s", strerror(errno)); /* setup signal handler pipe */ retval = pipe(pipefds); if (retval < 0) { - dbg("error getting pipes: %s", strerror(errno)); + err("error getting pipes: %s", strerror(errno)); goto exit; } retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK); if (retval < 0) { - dbg("error fcntl on read pipe: %s", strerror(errno)); + err("error fcntl on read pipe: %s", strerror(errno)); goto exit; } retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC); if (retval < 0) - dbg("error fcntl on read pipe: %s", strerror(errno)); + err("error fcntl on read pipe: %s", strerror(errno)); retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK); if (retval < 0) { - dbg("error fcntl on write pipe: %s", strerror(errno)); + err("error fcntl on write pipe: %s", strerror(errno)); goto exit; } retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC); if (retval < 0) - dbg("error fcntl on write pipe: %s", strerror(errno)); + err("error fcntl on write pipe: %s", strerror(errno)); /* set signal handlers */ memset(&act, 0x00, sizeof(struct sigaction)); - act.sa_handler = (void (*) (int))sig_handler; + act.sa_handler = (void (*)(int)) sig_handler; sigemptyset(&act.sa_mask); act.sa_flags = SA_RESTART; sigaction(SIGINT, &act, NULL); @@ -700,6 +811,10 @@ int main(int argc, char *argv[], char *envp[]) sigaction(SIGALRM, &act, NULL); sigaction(SIGCHLD, &act, NULL); + if (init_uevent_socket() < 0) { + dbg("uevent socket not available"); + } + if (init_udevsend_socket() < 0) { if (errno == EADDRINUSE) dbg("another udevd running, exit"); @@ -712,7 +827,7 @@ int main(int argc, char *argv[], char *envp[]) /* possible override of udev binary, used for testing */ udev_bin = getenv("UDEV_BIN"); if (udev_bin != NULL) - dbg("udev binary is set to '%s'", udev_bin); + info("udev binary is set to '%s'", udev_bin); else udev_bin = UDEV_BIN; @@ -720,7 +835,7 @@ int main(int argc, char *argv[], char *envp[]) udevd_expected_seqnum = getenv("UDEVD_EXPECTED_SEQNUM"); if (udevd_expected_seqnum != NULL) { expected_seqnum = strtoull(udevd_expected_seqnum, NULL, 10); - dbg("initialize expected_seqnum to %llu", expected_seqnum); + info("initialize expected_seqnum to %llu", expected_seqnum); } /* get current time to provide shorter timeout on startup */ @@ -729,6 +844,8 @@ int main(int argc, char *argv[], char *envp[]) FD_ZERO(&readfds); FD_SET(udevsendsock, &readfds); + if (ueventsock != -1) + FD_SET(ueventsock, &readfds); FD_SET(pipefds[0], &readfds); maxsockplus = udevsendsock+1; while (1) { @@ -745,8 +862,27 @@ int main(int argc, char *argv[], char *envp[]) if (FD_ISSET(udevsendsock, &workreadfds)) { msg = get_udevsend_msg(); - if (msg) + if (msg) { + /* discard kernel messages if netlink is active */ + if (uevent_active && msg->seqnum != 0) { + dbg("skip kernel udevsend message, netlink is active"); + free(msg); + continue; + } msg_queue_insert(msg); + } + } + + if (FD_ISSET(ueventsock, &workreadfds)) { + msg = get_uevent_msg(); + if (msg) { + msg_queue_insert(msg); + /* disable udevsend with first netlink message */ + if (!uevent_active) { + info("netlink message received, disable kernel udevsend messages"); + uevent_active = 1; + } + } } if (FD_ISSET(pipefds[0], &workreadfds))