X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=395cdca88baba503e39488c116b587f7196a7025;hp=2e63d8030e4035827e28a8fb42e780c7d8feda74;hb=5a73b25fd6673134328443af04afe7bde0060d72;hpb=1c5c245e6f053da7ac147a1733ea49dd84f260a5

diff --git a/udevd.c b/udevd.c
index 2e63d8030..395cdca88 100644
--- a/udevd.c
+++ b/udevd.c
@@ -1,10 +1,8 @@
 /*
- * udevd.c
+ * udevd.c - hotplug event serializer
  *
- * Userspace devfs
- *
- * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -22,263 +20,525 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/ipc.h>
+#include <stddef.h>
 #include <sys/wait.h>
-#include <sys/msg.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <fcntl.h>
+#include <sys/sysinfo.h>
+#include <sys/stat.h>
 
+#include "list.h"
 #include "udev.h"
+#include "udev_lib.h"
+#include "udev_version.h"
 #include "udevd.h"
 #include "logging.h"
 
-#define BUFFER_SIZE			1024
-#define EVENT_TIMEOUT_SECONDS		10
-#define DAEMON_TIMEOUT_SECONDS		30
-
+static int pipefds[2];
+static unsigned long long expected_seqnum = 0;
+static volatile int sigchilds_waiting;
+static volatile int run_msg_q;
+static volatile int sig_flag;
+static int run_exec_q;
+
+static LIST_HEAD(msg_list);
+static LIST_HEAD(exec_list);
+static LIST_HEAD(running_list);
+
+static void exec_queue_manager(void);
+static void msg_queue_manager(void);
+static void user_sighandler(void);
+static void reap_sigchilds(void);
+char *udev_bin;
+
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message (int level, const char *format, ...)
+{
+	va_list	args;
 
-static int expect_seqnum = 0;
-static struct hotplug_msg *head = NULL;
+	va_start(args, format);
+	vsyslog(level, 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 sig_alarmhandler(int signum)
+static void msg_dump_queue(void)
 {
-	dbg("caught signal %d", signum);
-	switch (signum) {
-	case SIGALRM:
-		dbg("event timeout reached");
-		break;
+#ifdef DEBUG
+	struct hotplug_msg *msg;
 
-	default:
-		dbg("unhandled signal");
-	}
+	list_for_each_entry(msg, &msg_list, list)
+		dbg("sequence %llu in queue", msg->seqnum);
+#endif
 }
 
-static void dump_queue(void)
+static struct hotplug_msg *msg_create(void)
 {
-	struct hotplug_msg *p;
-	p = head;
+	struct hotplug_msg *new_msg;
 
-	dbg("next expected sequence is %d", expect_seqnum);
-	while(p != NULL) {
-		dbg("sequence %d in queue", p->seqnum);
-		p = p->next;
-	}
+	new_msg = malloc(sizeof(struct hotplug_msg));
+	if (new_msg == NULL)
+		dbg("error malloc");
+	return new_msg;
 }
 
-static void dump_msg(struct hotplug_msg *pmsg)
+static void run_queue_delete(struct hotplug_msg *msg)
 {
-	dbg("sequence %d, '%s', '%s', '%s'",
-	    pmsg->seqnum, pmsg->action, pmsg->devpath, pmsg->subsystem);
+	list_del(&msg->list);
+	free(msg);
 }
 
-static int dispatch_msg(struct hotplug_msg *pmsg)
+/* orders the message in the queue by sequence number */
+static void msg_queue_insert(struct hotplug_msg *msg)
 {
-	pid_t pid;
-	char *argv[3];
-	extern char **environ;
+	struct hotplug_msg *loop_msg;
+	struct sysinfo info;
+
+	/* sort message by sequence number into list. events
+	 * will tend to come in order, so scan the list backwards
+	 */
+	list_for_each_entry_reverse(loop_msg, &msg_list, list)
+		if (loop_msg->seqnum < msg->seqnum)
+			break;
+
+	/* store timestamp of queuing */
+	sysinfo(&info);
+	msg->queue_time = info.uptime;
 
-	dump_msg(pmsg);
+	list_add(&msg->list, &loop_msg->list);
+	dbg("queued message seq %llu", msg->seqnum);
 
-	setenv("ACTION", pmsg->action, 1);
-	setenv("DEVPATH", pmsg->devpath, 1);
-	argv[0] = DEFAULT_UDEV_EXEC;
-	argv[1] = pmsg->subsystem;
-	argv[2] = NULL;
+	/* run msg queue manager */
+	run_msg_q = 1;
+
+	return ;
+}
+
+/* forks event and removes event from run queue when finished */
+static void udev_run(struct hotplug_msg *msg)
+{
+	pid_t pid;
+	char action[ACTION_SIZE];
+	char devpath[DEVPATH_SIZE];
+	char seqnum[SEQNUM_SIZE];
+	char *env[] = { action, devpath, seqnum, NULL };
+
+	snprintf(action, ACTION_SIZE-1, "ACTION=%s", msg->action);
+	action[ACTION_SIZE-1] = '\0';
+	snprintf(devpath, DEVPATH_SIZE-1, "DEVPATH=%s", msg->devpath);
+	devpath[DEVPATH_SIZE-1] = '\0';
+	sprintf(seqnum, "SEQNUM=%llu", msg->seqnum);
 
 	pid = fork();
 	switch (pid) {
 	case 0:
 		/* child */
-		execve(argv[0], argv, environ);
+		execle(udev_bin, "udev", msg->subsystem, NULL, env);
 		dbg("exec of child failed");
-		exit(1);
+		_exit(1);
 		break;
 	case -1:
 		dbg("fork of child failed");
-		return -1;
+		run_queue_delete(msg);
+		/* note: we never managed to run, so we had no impact on 
+		 * running_with_devpath(), so don't bother setting run_exec_q
+		 */
+		break;
 	default:
-		wait(0);
+		/* get SIGCHLD in main loop */
+		dbg("==> exec seq %llu [%d] working at '%s'", msg->seqnum, pid, msg->devpath);
+		msg->pid = pid;
 	}
-	return 0;
 }
 
-static void set_timer(int seconds)
+/* returns already running task with devpath */
+static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
 {
-	signal(SIGALRM, sig_alarmhandler);
-	alarm(seconds);
+	struct hotplug_msg *loop_msg;
+	list_for_each_entry(loop_msg, &running_list, list)
+		if (strncmp(loop_msg->devpath, msg->devpath, sizeof(loop_msg->devpath)) == 0)
+			return loop_msg;
+	return NULL;
 }
 
-static void check_queue(void)
+/* exec queue management routine executes the events and delays events for the same devpath */
+static void exec_queue_manager(void)
 {
-	struct hotplug_msg *p;
-	p = head;
-
-	dump_queue();
-	while(head != NULL && head->seqnum == expect_seqnum) {
-		dispatch_msg(head);
-		expect_seqnum++;
-		p = head;
-		head = head->next;
-		free(p);
+	struct hotplug_msg *loop_msg;
+	struct hotplug_msg *tmp_msg;
+	struct hotplug_msg *msg;
+
+	list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, list) {
+		msg = running_with_devpath(loop_msg);
+		if (!msg) {
+			/* move event to run list */
+			list_move_tail(&loop_msg->list, &running_list);
+			udev_run(loop_msg);
+			dbg("moved seq %llu to running list", loop_msg->seqnum);
+		} else {
+			dbg("delay seq %llu, cause seq %llu already working on '%s'",
+				loop_msg->seqnum, msg->seqnum, msg->devpath);
+		}
 	}
-	if (head != NULL)
-		set_timer(EVENT_TIMEOUT_SECONDS);
-	else
-		set_timer(DAEMON_TIMEOUT_SECONDS);
 }
 
-static void add_queue(struct hotplug_msg *pmsg)
+static void msg_move_exec(struct hotplug_msg *msg)
+{
+	list_move_tail(&msg->list, &exec_list);
+	run_exec_q = 1;
+	expected_seqnum = msg->seqnum+1;
+	dbg("moved seq %llu to exec, next expected is %llu",
+		msg->seqnum, expected_seqnum);
+}
+
+/* msg queue management routine handles the timeouts and dispatches the events */
+static void msg_queue_manager(void)
 {
-	struct hotplug_msg *pnewmsg;
-	struct hotplug_msg *p;
-	struct hotplug_msg *p1;
-
-	p = head;
-	p1 = NULL;
-	pnewmsg = malloc(sizeof(struct hotplug_msg));
-	*pnewmsg = *pmsg;
-	pnewmsg->next = NULL;
-	while(p != NULL && pmsg->seqnum > p->seqnum) {
-		p1 = p;
-		p = p->next;
+	struct hotplug_msg *loop_msg;
+	struct hotplug_msg *tmp_msg;
+	struct sysinfo info;
+	long msg_age = 0;
+
+	dbg("msg queue manager, next expected is %llu", expected_seqnum);
+recheck:
+	list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, list) {
+		/* move event with expected sequence to the exec list */
+		if (loop_msg->seqnum == expected_seqnum) {
+			msg_move_exec(loop_msg);
+			continue;
+		}
+
+		/* move event with expired timeout to the exec list */
+		sysinfo(&info);
+		msg_age = info.uptime - loop_msg->queue_time;
+		dbg("seq %llu is %li seconds old", loop_msg->seqnum, msg_age);
+		if (msg_age > EVENT_TIMEOUT_SEC-1) {
+			msg_move_exec(loop_msg);
+			goto recheck;
+		} else {
+			break;
+		}
 	}
-	pnewmsg->next = p;
-	if (p1 == NULL) {
-		head = pnewmsg;
-	} else {
-		p1->next = pnewmsg;
+
+	msg_dump_queue();
+
+	/* set timeout for remaining queued events */
+	if (list_empty(&msg_list) == 0) {
+		struct itimerval itv = {{0, 0}, {EVENT_TIMEOUT_SEC - msg_age, 0}};
+		dbg("next event expires in %li seconds", EVENT_TIMEOUT_SEC - msg_age);
+		setitimer(ITIMER_REAL, &itv, NULL);
 	}
-	dump_queue();
 }
 
-static int lock_file = -1;
-static char *lock_filename = ".udevd_lock";
-
-static int process_queue(void)
+/* receive the msg, do some basic sanity checks, and queue it */
+static void handle_msg(int sock)
 {
-	int msgid;
-	key_t key;
-	struct hotplug_msg *pmsg;
-	char buf[BUFFER_SIZE];
-	int ret;
-
-	key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
-	pmsg = (struct hotplug_msg *) buf;
-	msgid = msgget(key, IPC_CREAT);
-	if (msgid == -1) {
-		dbg("open message queue error");
-		return -1;
+	struct hotplug_msg *msg;
+	int retval;
+	struct msghdr smsg;
+	struct cmsghdr *cmsg;
+	struct iovec iov;
+	struct ucred *cred;
+	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
+
+	msg = msg_create();
+	if (msg == NULL) {
+		dbg("unable to store message");
+		return;
 	}
-	while (1) {
-		ret = msgrcv(msgid, (struct msgbuf *) buf, BUFFER_SIZE-4, HOTPLUGMSGTYPE, 0);
-		if (ret != -1) {
-			dbg("current sequence %d, expected sequence %d", pmsg->seqnum, expect_seqnum);
-
-			/* init expected sequence with value from first call */
-			if (expect_seqnum == 0) {
-				expect_seqnum = pmsg->seqnum;
-				dbg("init next expected sequence number to %d", expect_seqnum);
-			}
 
-			if (pmsg->seqnum > expect_seqnum) {
-				add_queue(pmsg);
-				set_timer(EVENT_TIMEOUT_SECONDS);
-			} else {
-				if (pmsg->seqnum == expect_seqnum) {
-					dispatch_msg(pmsg);
-					expect_seqnum++;
-					check_queue();
-				} else {
-					dbg("timeout event for unexpected sequence number %d", pmsg->seqnum);
-				}
-			}
-		} else {
-			if (errno == EINTR) {
-				if (head != NULL) {
-					/* event timeout, skip all missing, proceed with next queued event */
-					info("timeout reached, skip events %d - %d", expect_seqnum, head->seqnum-1);
-					expect_seqnum = head->seqnum;
-				} else {
-					info("we have nothing to do, so daemon exits...");
-					if (lock_file >= 0) {
-						close(lock_file);
-						unlink(lock_filename);
-					}
-					exit(0);
-				}
-				check_queue();
-			} else {
-				dbg("ipc message receive error '%s'", strerror(errno));
-			}
-		}
+	iov.iov_base = msg;
+	iov.iov_len = sizeof(struct hotplug_msg);
+
+	memset(&smsg, 0x00, sizeof(struct msghdr));
+	smsg.msg_iov = &iov;
+	smsg.msg_iovlen = 1;
+	smsg.msg_control = cred_msg;
+	smsg.msg_controllen = sizeof(cred_msg);
+
+	retval = recvmsg(sock, &smsg, 0);
+	if (retval <  0) {
+		if (errno != EINTR)
+			dbg("unable to receive message");
+		return;
+	}
+	cmsg = CMSG_FIRSTHDR(&smsg);
+	cred = (struct ucred *) CMSG_DATA(cmsg);
+
+	if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
+		dbg("no sender credentials received, message ignored");
+		goto skip;
+	}
+
+	if (cred->uid != 0) {
+		dbg("sender uid=%i, message ignored", cred->uid);
+		goto skip;
 	}
-	return 0;
+
+	if (strncmp(msg->magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+		dbg("message magic '%s' doesn't match, ignore it", msg->magic);
+		goto skip;
+	}
+
+	/* if no seqnum is given, we move straight to exec queue */
+	if (msg->seqnum == 0) {
+		list_add(&msg->list, &exec_list);
+		run_exec_q = 1;
+	} else {
+		msg_queue_insert(msg);
+	}
+	return;
+
+skip:
+	free(msg);
+	return;
 }
 
-static void sig_handler(int signum)
+static void asmlinkage sig_handler(int signum)
 {
-	dbg("caught signal %d", signum);
+	int rc;
+
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-		case SIGKILL:
-			if (lock_file >= 0) {
-				close(lock_file);
-				unlink(lock_filename);
-			}
 			exit(20 + signum);
 			break;
+		case SIGALRM:
+			/* set flag, then write to pipe if needed */
+			run_msg_q = 1;
+			goto do_write;
+			break;
+		case SIGCHLD:
+			/* set flag, then write to pipe if needed */
+			sigchilds_waiting = 1;
+			goto do_write;
+			break;
+	}
+
+do_write:
+	/* if pipe is empty, write to pipe to force select to return
+	 * immediately when it gets called
+	 */
+	if (!sig_flag) {
+		rc = write(pipefds[1],&signum,sizeof(signum));
+		if (rc >= 0)
+			sig_flag = 1;
+	}
+}
 
-		default:
-			dbg("unhandled signal");
+static void udev_done(int pid)
+{
+	/* find msg associated with pid and delete it */
+	struct hotplug_msg *msg;
+
+	list_for_each_entry(msg, &running_list, list) {
+		if (msg->pid == pid) {
+			dbg("<== exec seq %llu came back", msg->seqnum);
+			run_queue_delete(msg);
+
+			/* we want to run the exec queue manager since there may
+			 * be events waiting with the devpath of the one that
+			 * just finished
+			 */
+			run_exec_q = 1;
+			return;
+		}
 	}
 }
 
-static int one_and_only(void)
+static void reap_sigchilds(void)
 {
-	char string[100];
-
-	lock_file = open(lock_filename, O_RDWR | O_CREAT, 0x640);
-
-	/* see if we can open */
-	if (lock_file < 0)
-		return -EINVAL;
-	
-	/* see if we can lock */
-	if (lockf(lock_file, F_TLOCK, 0) < 0) {
-		close(lock_file);
-		unlink(lock_filename);
-		return -EINVAL;
+	while(1) {
+		int pid = waitpid(-1, NULL, WNOHANG);
+		if ((pid == -1) || (pid == 0))
+			break;
+		udev_done(pid);
 	}
+}
+
+/* just read everything from the pipe and clear the flag,
+ * the flags was set in the signal handler
+ */
+static void user_sighandler(void)
+{
+	int sig;
+	while(1) {
+		int rc = read(pipefds[0], &sig, sizeof(sig));
+		if (rc < 0)
+			break;
 
-	snprintf(string, sizeof(string), "%d\n", getpid());
-	write(lock_file, string, strlen(string));
-	
-	return 0;
+		sig_flag = 0;
+	}
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
-	/* only let one version of the daemon run at any one time */
-	if (one_and_only() != 0)
-		exit(0);
+	int ssock, maxsockplus;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	int retval, fd;
+	const int feature_on = 1;
+	struct sigaction act;
+	fd_set readfds;
+
+	logging_init("udevd");
+	dbg("version %s", UDEV_VERSION);
+
+	if (getuid() != 0) {
+		dbg("need to be root, exit");
+		_exit(1);
+	}
+
+	/* make sure we don't lock any path */
+	chdir("/");
+	umask(umask(077) | 022);
+
+	/* Set fds to dev/null */
+	fd = open( "/dev/null", O_RDWR );
+	if ( fd < 0 ) {
+		dbg("error opening /dev/null %s", strerror(errno));
+		exit(1);
+	}
+	dup2(fd, 0);
+	dup2(fd, 1);
+	dup2(fd, 2);
+	if (fd > 2) 
+		close(fd);
+
+	/* become session leader */
+	setsid();
+
+	/* setup signal handler pipe */
+	retval = pipe(pipefds);
+	if (retval < 0) {
+		dbg("error getting pipes: %s", strerror(errno));
+		exit(1);
+	}
+
+	retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
+	if (retval < 0) {
+		dbg("error fcntl on read pipe: %s", strerror(errno));
+		exit(1);
+	}
+	retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
+	if (retval < 0) {
+		dbg("error fcntl on read pipe: %s", strerror(errno));
+		exit(1);
+	}
 
-	/* set up signal handler */
-	signal(SIGINT, sig_handler);
-	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
+	retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
+	if (retval < 0) {
+		dbg("error fcntl on write pipe: %s", strerror(errno));
+		exit(1);
+	}
+	retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
+	if (retval < 0) {
+		dbg("error fcntl on write pipe: %s", strerror(errno));
+		exit(1);
+	}
+
+	/* set signal handlers */
+	act.sa_handler = (void (*) (int))sig_handler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
+	sigaction(SIGALRM, &act, NULL);
+	sigaction(SIGCHLD, &act, NULL);
+
+	memset(&saddr, 0x00, sizeof(saddr));
+	saddr.sun_family = AF_LOCAL;
+	/* use abstract namespace for socket path */
+	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	ssock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	if (ssock == -1) {
+		dbg("error getting socket, exit");
+		exit(1);
+	}
+
+	set_cloexec_flag(ssock, 1);
+
+	/* the bind takes care of ensuring only one copy running */
+	retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);
+	if (retval < 0) {
+		dbg("bind failed, exit");
+		goto exit;
+	}
+	retval = fcntl(ssock, F_SETFD, FD_CLOEXEC);
+	if (retval < 0) {
+		dbg("error fcntl on ssock: %s", strerror(errno));
+		exit(1);
+	}
+
+	/* enable receiving of the sender credentials */
+	setsockopt(ssock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
+
+	/* 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);
+	else
+		udev_bin = UDEV_BIN;
+
+	FD_ZERO(&readfds);
+	FD_SET(ssock, &readfds);
+	FD_SET(pipefds[0], &readfds);
+	maxsockplus = ssock+1;
+	while (1) {
+		fd_set workreadfds = readfds;
+		retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
+
+		if (retval < 0) {
+			if (errno != EINTR)
+				dbg("error in select: %s", strerror(errno));
+			continue;
+		}
+
+		if (FD_ISSET(ssock, &workreadfds))
+			handle_msg(ssock);
+
+		if (FD_ISSET(pipefds[0], &workreadfds))
+			user_sighandler();
 
-	/* we exit if we have nothing to do, next event will start us again */
-	set_timer(DAEMON_TIMEOUT_SECONDS);
+		if (sigchilds_waiting) {
+			sigchilds_waiting = 0;
+			reap_sigchilds();
+		}
+
+		if (run_msg_q) {
+			run_msg_q = 0;
+			msg_queue_manager();
+		}
 
-	/* main loop */
-	process_queue();
-	return 0;
+		if (run_exec_q) {
+			 /* clean up running_list before calling exec_queue_manager() */
+			if (sigchilds_waiting) {
+				sigchilds_waiting = 0;
+				reap_sigchilds();
+			}
+
+			run_exec_q = 0;
+			exec_queue_manager();
+		}
+	}
+exit:
+	close(ssock);
+	logging_close();
+	return 1;
 }