X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=82ebd22dbad1dc1891fcdc34bcbee2a5df8182d8;hp=4aad165d8a85c50f91a92344713e6dbda9b9ba76;hb=c3b145a381090f18c4c5f4149e19183343880ec2;hpb=456cb387567da8a2beadf003dcbd874022dbc873

diff --git a/udevd.c b/udevd.c
index 4aad165d8..82ebd22db 100644
--- a/udevd.c
+++ b/udevd.c
@@ -77,15 +77,13 @@ void log_message(int priority, const char *format, ...)
 		return;
 
 	va_start(args, format);
-	vsyslog(priority, format, args);
-	va_end(args);
-
 	if (verbose) {
-		va_start(args, format);
+		printf("[%d] ", (int) getpid());
 		vprintf(format, args);
-		va_end(args);
 		printf("\n");
-	}
+	} else
+		vsyslog(priority, format, args);
+	va_end(args);
 }
 
 #endif
@@ -124,34 +122,19 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 	for (i = 0; msg->envp[i]; i++)
 		putenv(msg->envp[i]);
 
-	udev = udev_device_init();
+	udev = udev_device_init(NULL);
 	if (udev == NULL)
 		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);
 
 	/* run programs collected by RUN-key*/
-	if (retval == 0 && !udev->ignore_device && udev_run) {
-		struct name_entry *name_loop;
-
-		dbg("executing run list");
-		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:")], udev->dev->devpath, udev->action);
-			else {
-				char program[PATH_SIZE];
-
-				strlcpy(program, name_loop->name, sizeof(program));
-				udev_rules_apply_format(udev, program, sizeof(program));
-				if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
-						(udev_log_priority >= LOG_INFO)))
-					retval = -1;
-			}
-		}
-	}
+	if (retval == 0 && !udev->ignore_device && udev_run)
+		retval = udev_rules_run(udev);
 
 	udev_device_cleanup(udev);
 	return retval;
@@ -168,66 +151,65 @@ 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;
+		symlink(msg->devpath, filename);
+		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
@@ -257,7 +239,7 @@ static void udev_event_run(struct udevd_uevent_msg *msg)
 		setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
 
 		retval = udev_event_process(msg);
-		info("seq %llu finished", msg->seqnum);
+		info("seq %llu finished with %i", msg->seqnum, retval);
 
 		logging_close();
 		if (retval)
@@ -295,6 +277,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) {
@@ -318,61 +301,43 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 
 static int mem_size_mb(void)
 {
-	int f;
-	char buf[8192];
-	long int len;
-	const char *pos;
-	long int memsize;
-
-	f = open("/proc/meminfo", O_RDONLY);
-	if (f == -1)
-		return -1;
+	FILE* f;
+	char buf[4096];
+	long int memsize = -1;
 
-	len = read(f, buf, sizeof(buf)-1);
-	close(f);
-
-	if (len <= 0)
+	f = fopen("/proc/meminfo", "r");
+	if (f == NULL)
 		return -1;
-	buf[len] = '\0';
 
-	pos = strstr(buf, "MemTotal: ");
-	if (pos == NULL)
-		return -1;
+	while (fgets(buf, sizeof(buf), f) != NULL) {
+		long int value;
 
-	if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1)
-		return -1;
+		if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+			memsize = value / 1024;
+			break;
+		}
+	}
 
-	return memsize / 1024;
+	fclose(f);
+	return memsize;
 }
 
 static int cpu_count(void)
 {
-	int f;
-	char buf[65536];
-	int len;
-	const char *pos;
+	FILE* f;
+	char buf[4096];
 	int count = 0;
 
-	f = open("/proc/stat", O_RDONLY);
-	if (f == -1)
+	f = fopen("/proc/stat", "r");
+	if (f == NULL)
 		return -1;
 
-	len = read(f, buf, sizeof(buf)-1);
-	close(f);
-	if (len <= 0)
-		return -1;
-	buf[len] = '\0';
-
-	pos = strstr(buf, "cpu");
-	if (pos == NULL)
-		return -1;
-
-	while (pos != NULL) {
-		if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3]))
+	while (fgets(buf, sizeof(buf), f) != NULL) {
+		if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
 			count++;
-		pos = strstr(&pos[3], "cpu");
 	}
 
+	fclose(f);
 	if (count == 0)
 		return -1;
 	return count;
@@ -380,29 +345,24 @@ static int cpu_count(void)
 
 static int running_processes(void)
 {
-	int f;
-	char buf[32768];
-	int len;
-	int running;
-	const char *pos;
+	FILE* f;
+	char buf[4096];
+	int running = -1;
 
-	f = open("/proc/stat", O_RDONLY);
-	if (f == -1)
+	f = fopen("/proc/stat", "r");
+	if (f == NULL)
 		return -1;
 
-	len = read(f, buf, sizeof(buf)-1);
-	close(f);
-	if (len <= 0)
-		return -1;
-	buf[len] = '\0';
-
-	pos = strstr(buf, "procs_running ");
-	if (pos == NULL)
-		return -1;
+	while (fgets(buf, sizeof(buf), f) != NULL) {
+		int value;
 
-	if (sscanf(pos, "procs_running %u", &running) != 1)
-		return -1;
+		if (sscanf(buf, "procs_running %u", &value) == 1) {
+			running = value;
+			break;
+		}
+	}
 
+	fclose(f);
 	return running;
 }
 
@@ -495,38 +455,86 @@ static int compare_devpath(const char *running, const char *waiting)
 	return 0;
 }
 
-/* returns still running task for the same device, its parent or its physical device */
-static int running_with_devpath(struct udevd_uevent_msg *msg, int limit)
+/* lookup event for identical, parent, child, or physical device */
+static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 {
 	struct udevd_uevent_msg *loop_msg;
 	int childs_count = 0;
 
+	/* check exec-queue which may still contain delayed events we depend on */
+	list_for_each_entry(loop_msg, &exec_list, node) {
+		/* skip ourself and all later events */
+		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 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) */
+		if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
+			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 5;
+			}
+	}
+
+	/* 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 child reached", msg->seqnum, childs_count);
+			dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count);
 			return 1;
 		}
 
-		/* return running parent/child device event */
+		/* 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, child device event still running %llu (%s)",
+			dbg("%llu, device event still running %llu (%s)",
 			    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-			return 2;
+			return 3;
 		}
 
-		/* return running physical device event */
+		/* 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) */
 		if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
 			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;
 }
 
-/* exec queue management routine executes the events and serializes events in the same sequence */
+/* serializes events for the identical and parent and child devices */
 static void msg_queue_manager(void)
 {
 	struct udevd_uevent_msg *loop_msg;
@@ -552,8 +560,8 @@ static void msg_queue_manager(void)
 			}
 		}
 
-		/* don't run two processes for the same devpath and wait for the parent*/
-		if (running_with_devpath(loop_msg, max_childs)) {
+		/* serialize and wait for parent or child events */
+		if (devpath_busy(loop_msg, max_childs) != 0) {
 			dbg("delay seq %llu (%s)", loop_msg->seqnum, loop_msg->devpath);
 			continue;
 		}
@@ -604,6 +612,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)
@@ -645,6 +655,7 @@ static void get_ctrl_msg(void)
 	struct ucred *cred;
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
 	int *intval;
+	char *pos;
 
 	memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
 	iov.iov_base = &ctrl_msg;
@@ -681,6 +692,21 @@ static void get_ctrl_msg(void)
 	}
 
 	switch (ctrl_msg.type) {
+	case UDEVD_CTRL_ENV:
+		pos = strchr(ctrl_msg.buf, '=');
+		if (pos == NULL) {
+			err("wrong key format '%s'", ctrl_msg.buf);
+			break;
+		}
+		pos[0] = '\0';
+		if (pos[1] == '\0') {
+			info("udevd message (ENV) received, unset '%s'", ctrl_msg.buf);
+			unsetenv(ctrl_msg.buf);
+		} else {
+			info("udevd message (ENV) received, set '%s=%s'", ctrl_msg.buf, &pos[1]);
+			setenv(ctrl_msg.buf, &pos[1], 1);
+		}
+		break;
 	case UDEVD_CTRL_STOP_EXEC_QUEUE:
 		info("udevd message (STOP_EXEC_QUEUE) received");
 		stop_exec_q = 1;
@@ -942,7 +968,6 @@ int main(int argc, char *argv[], char *envp[])
 	selinux_init();
 	dbg("version %s", UDEV_VERSION);
 
-	/* parse commandline options */
 	while (1) {
 		option = getopt_long(argc, argv, "dtvhV", options, NULL);
 		if (option == -1)
@@ -1103,10 +1128,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));
 
@@ -1191,12 +1223,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;