X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=c6642f4359b890d1cb63cdf75ddff4739df52fab;hp=015083714389aaa65e2036a51b4216dc5cfa8bf6;hb=8b72687876747186d5f1a5a45464bf64b1a166f5;hpb=f8c1ccde6aaf08c858616c9a8a83c06d609f52f5

diff --git a/udevd.c b/udevd.c
index 015083714..c6642f435 100644
--- a/udevd.c
+++ b/udevd.c
@@ -38,12 +38,16 @@
 
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
 #include "udev_version.h"
+#include "udev_utils.h"
 #include "udevd.h"
 #include "logging.h"
 
+/* global variables*/
+static int udevsendsock;
+
 static int pipefds[2];
+static long startup_time;
 static unsigned long long expected_seqnum = 0;
 static volatile int sigchilds_waiting;
 static volatile int run_msg_q;
@@ -61,7 +65,6 @@ 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;
@@ -86,16 +89,6 @@ static void msg_dump_queue(void)
 #endif
 }
 
-static struct hotplug_msg *msg_create(void)
-{
-	struct hotplug_msg *new_msg;
-
-	new_msg = malloc(sizeof(struct hotplug_msg));
-	if (new_msg == NULL)
-		dbg("error malloc");
-	return new_msg;
-}
-
 static void run_queue_delete(struct hotplug_msg *msg)
 {
 	list_del(&msg->list);
@@ -131,23 +124,16 @@ 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)
 {
+	char *const argv[] = { "udev", msg->subsystem, NULL };
 	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 */
-		execle(udev_bin, "udev", msg->subsystem, NULL, env);
+		close(udevsendsock);
+		logging_close();
+		execve(udev_bin, argv, msg->envp);
 		dbg("exec of child failed");
 		_exit(1);
 		break;
@@ -165,17 +151,40 @@ static void udev_run(struct hotplug_msg *msg)
 	}
 }
 
-/* returns already running task with devpath */
+/* returns still running task for the same event sequence */
 static struct hotplug_msg *running_with_devpath(struct hotplug_msg *msg)
 {
 	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;
+	int i;
+
+	list_for_each_entry(loop_msg, &running_list, list) {
+		if (loop_msg->devpath == NULL || msg->devpath == NULL)
+			continue;
+
+		/* is a parent or child device event still running */
+		for (i = 0; i < DEVPATH_SIZE; i++) {
+			if (loop_msg->devpath[i] == '\0' || msg->devpath[i] == '\0')
+				return loop_msg;
+
+			if (loop_msg->devpath[i] != msg->devpath[i])
+				break;
+		}
+
+		/* is the physical device event still running on an add sequence */
+		if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
+			for (i = 0; i < DEVPATH_SIZE; i++) {
+				if (loop_msg->devpath[i] == '\0' || msg->physdevpath[i] == '\0')
+					return loop_msg;
+
+				if (loop_msg->devpath[i] != msg->physdevpath[i])
+					break;
+			}
+	}
+
 	return NULL;
 }
 
-/* exec queue management routine executes the events and delays events for the same devpath */
+/* exec queue management routine executes the events and serializes events in the same sequence */
 static void exec_queue_manager(void)
 {
 	struct hotplug_msg *loop_msg;
@@ -190,8 +199,8 @@ static void exec_queue_manager(void)
 			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);
+			dbg("delay seq %llu (%s), cause seq %llu (%s) is still running",
+			    loop_msg->seqnum, loop_msg->devpath, msg->seqnum, msg->devpath);
 		}
 	}
 }
@@ -212,6 +221,8 @@ static void msg_queue_manager(void)
 	struct hotplug_msg *tmp_msg;
 	struct sysinfo info;
 	long msg_age = 0;
+	static int timeout = EVENT_INIT_TIMEOUT_SEC;
+	static int init = 1;
 
 	dbg("msg queue manager, next expected is %llu", expected_seqnum);
 recheck:
@@ -222,11 +233,18 @@ recheck:
 			continue;
 		}
 
+		/* see if we are in the initialization phase and wait for the very first events */
+		if (init && (info.uptime - startup_time >= INIT_TIME_SEC)) {
+			init = 0;
+			timeout = EVENT_TIMEOUT_SEC;
+			dbg("initialization phase passed, set timeout to %i seconds", EVENT_TIMEOUT_SEC);
+		}
+
 		/* 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) {
+		if (msg_age >= timeout) {
 			msg_move_exec(loop_msg);
 			goto recheck;
 		} else {
@@ -238,31 +256,30 @@ recheck:
 
 	/* 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);
+		struct itimerval itv = {{0, 0}, {timeout - msg_age, 0}};
+		dbg("next event expires in %li seconds", timeout - msg_age);
 		setitimer(ITIMER_REAL, &itv, NULL);
 	}
 }
 
 /* receive the msg, do some basic sanity checks, and queue it */
-static void handle_msg(int sock)
+static void handle_udevsend_msg(int sock)
 {
+	static struct udevsend_msg usend_msg;
 	struct hotplug_msg *msg;
-	int retval;
+	int bufpos;
+	int i;
+	ssize_t size;
 	struct msghdr smsg;
 	struct cmsghdr *cmsg;
 	struct iovec iov;
 	struct ucred *cred;
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
+	int envbuf_size;
 
-	msg = msg_create();
-	if (msg == NULL) {
-		dbg("unable to store message");
-		return;
-	}
-
-	iov.iov_base = msg;
-	iov.iov_len = sizeof(struct hotplug_msg);
+	memset(&usend_msg, 0x00, sizeof(struct udevsend_msg));
+	iov.iov_base = &usend_msg;
+	iov.iov_len = sizeof(struct udevsend_msg);
 
 	memset(&smsg, 0x00, sizeof(struct msghdr));
 	smsg.msg_iov = &iov;
@@ -270,8 +287,8 @@ static void handle_msg(int sock)
 	smsg.msg_control = cred_msg;
 	smsg.msg_controllen = sizeof(cred_msg);
 
-	retval = recvmsg(sock, &smsg, 0);
-	if (retval <  0) {
+	size = recvmsg(sock, &smsg, 0);
+	if (size <  0) {
 		if (errno != EINTR)
 			dbg("unable to receive message");
 		return;
@@ -281,19 +298,56 @@ static void handle_msg(int sock)
 
 	if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
 		dbg("no sender credentials received, message ignored");
-		goto skip;
+		goto exit;
 	}
 
 	if (cred->uid != 0) {
 		dbg("sender uid=%i, message ignored", cred->uid);
-		goto skip;
+		goto exit;
 	}
 
-	if (strncmp(msg->magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-		dbg("message magic '%s' doesn't match, ignore it", msg->magic);
-		goto skip;
+	if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+		dbg("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+		goto exit;
 	}
 
+	envbuf_size = size - offsetof(struct udevsend_msg, envbuf);
+	dbg("envbuf_size=%i", envbuf_size);
+	msg = malloc(sizeof(struct hotplug_msg) + envbuf_size);
+	memset(msg, 0x00, sizeof(struct hotplug_msg) + envbuf_size);
+
+	/* 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;
+
+		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];
+	}
+	msg->envp[i++] = "UDEVD_EVENT=1";
+	msg->envp[i] = NULL;
+
 	/* if no seqnum is given, we move straight to exec queue */
 	if (msg->seqnum == 0) {
 		list_add(&msg->list, &exec_list);
@@ -301,10 +355,8 @@ static void handle_msg(int sock)
 	} else {
 		msg_queue_insert(msg);
 	}
-	return;
 
-skip:
-	free(msg);
+exit:
 	return;
 }
 
@@ -327,20 +379,15 @@ static void asmlinkage sig_handler(int signum)
 			sigchilds_waiting = 1;
 			goto do_write;
 			break;
-		default:
-			dbg("unhandled signal %d", signum);
-			return;
 	}
-	
+
 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)
-			dbg("unable to write to pipe");
-		else
+		if (rc >= 0)
 			sig_flag = 1;
 	}
 }
@@ -392,7 +439,8 @@ static void user_sighandler(void)
 
 int main(int argc, char *argv[], char *envp[])
 {
-	int ssock, maxsockplus;
+	struct sysinfo info;
+	int maxsockplus;
 	struct sockaddr_un saddr;
 	socklen_t addrlen;
 	int retval, fd;
@@ -405,7 +453,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (getuid() != 0) {
 		dbg("need to be root, exit");
-		_exit(1);
+		goto exit;
 	}
 
 	/* make sure we don't lock any path */
@@ -416,7 +464,7 @@ int main(int argc, char *argv[], char *envp[])
 	fd = open( "/dev/null", O_RDWR );
 	if ( fd < 0 ) {
 		dbg("error opening /dev/null %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 	dup2(fd, 0);
 	dup2(fd, 1);
@@ -431,29 +479,29 @@ int main(int argc, char *argv[], char *envp[])
 	retval = pipe(pipefds);
 	if (retval < 0) {
 		dbg("error getting pipes: %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 
 	retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
 	if (retval < 0) {
 		dbg("error fcntl on read pipe: %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 	retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
 	if (retval < 0) {
 		dbg("error fcntl on read pipe: %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 
 	retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
 	if (retval < 0) {
 		dbg("error fcntl on write pipe: %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 	retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
 	if (retval < 0) {
 		dbg("error fcntl on write pipe: %s", strerror(errno));
-		exit(1);
+		goto exit;
 	}
 
 	/* set signal handlers */
@@ -471,28 +519,22 @@ int main(int argc, char *argv[], char *envp[])
 	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) {
+	udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	if (udevsendsock == -1) {
 		dbg("error getting socket, exit");
-		exit(1);
+		goto exit;
 	}
 
-	set_cloexec_flag(ssock, 1);
-
 	/* the bind takes care of ensuring only one copy running */
-	retval = bind(ssock, (struct sockaddr *) &saddr, addrlen);
+	retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
 	if (retval < 0) {
 		dbg("bind failed, exit");
+		close(udevsendsock);
 		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));
+	setsockopt(udevsendsock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
 
 	/* possible override of udev binary, used for testing */
 	udev_bin = getenv("UDEV_BIN");
@@ -501,10 +543,14 @@ int main(int argc, char *argv[], char *envp[])
 	else
 		udev_bin = UDEV_BIN;
 
+	/* handle special startup timeout*/
+	sysinfo(&info);
+	startup_time = info.uptime;
+
 	FD_ZERO(&readfds);
-	FD_SET(ssock, &readfds);
+	FD_SET(udevsendsock, &readfds);
 	FD_SET(pipefds[0], &readfds);
-	maxsockplus = ssock+1;
+	maxsockplus = udevsendsock+1;
 	while (1) {
 		fd_set workreadfds = readfds;
 		retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
@@ -515,8 +561,8 @@ int main(int argc, char *argv[], char *envp[])
 			continue;
 		}
 
-		if (FD_ISSET(ssock, &workreadfds))
-			handle_msg(ssock);
+		if (FD_ISSET(udevsendsock, &workreadfds))
+			handle_udevsend_msg(udevsendsock);
 
 		if (FD_ISSET(pipefds[0], &workreadfds))
 			user_sighandler();
@@ -542,8 +588,8 @@ int main(int argc, char *argv[], char *envp[])
 			exec_queue_manager();
 		}
 	}
+
 exit:
-	close(ssock);
 	logging_close();
 	return 1;
 }