X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=345fb20e22773a15ce28ce31a22c2a0abeb20fd3;hb=f07996885dab45102492d7f16e7e2997e264c725;hp=fe579b49c7f7065d4b1c9a827e785468a3e973eb;hpb=77b852f3334311575b9c19ffb29d4a77a21b4bb2;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index fe579b49c..345fb20e2 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -231,8 +231,9 @@ found:
 			break;
 		case SUBST_DRIVER:
 			if (event->dev_parent != NULL) {
-				const char *driver = udev_device_get_driver(event->dev_parent);
+				const char *driver;
 
+				driver = udev_device_get_driver(event->dev_parent);
 				if (driver == NULL)
 					break;
 				util_strlcat(string, driver, maxsize);
@@ -319,7 +320,7 @@ found:
 				size = strlen(value);
 				while (size > 0 && isspace(value[--size]))
 					value[size] = '\0';
-				count = util_replace_chars(value, ALLOWED_CHARS_INPUT);
+				count = udev_util_replace_chars(value, UDEV_ALLOWED_CHARS_INPUT);
 				if (count > 0)
 					info(event->udev, "%i character(s) replaced\n" , count);
 				util_strlcat(string, value, maxsize);
@@ -353,12 +354,24 @@ found:
 
 				if (event->tmp_node != NULL) {
 					util_strlcat(string, event->tmp_node, maxsize);
-					dbg(event->udev, "return existing temporary node\n");
+					dbg(event->udev, "tempnode: return earlier created one\n");
 					break;
 				}
 				devnum = udev_device_get_devnum(dev);
-				if (major(udev_device_get_devnum(dev) == 0))
+				if (major(devnum) == 0)
 					break;
+				/* lookup kernel provided node */
+				if (udev_device_get_knodename(dev) != NULL) {
+					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
+					util_strlcat(filename, "/", sizeof(filename));
+					util_strlcat(filename, udev_device_get_knodename(dev), sizeof(filename));
+					if (stat(filename, &statbuf) == 0 && statbuf.st_rdev == devnum) {
+						util_strlcat(string, filename, maxsize);
+						dbg(event->udev, "tempnode: return kernel node\n");
+						break;
+					}
+				}
+				/* lookup /dev/{char,block}/<maj>:<min> */
 				if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
 					devtype = "block";
 				else
@@ -369,10 +382,11 @@ found:
 					 minor(udev_device_get_devnum(dev)));
 				if (stat(filename, &statbuf) == 0 && statbuf.st_rdev == devnum) {
 					util_strlcat(string, filename, maxsize);
-					dbg(event->udev, "return existing temporary node\n");
+					dbg(event->udev, "tempnode: return maj:min node\n");
 					break;
 				}
-				dbg(event->udev, "create temporary node\n");
+				/* create temporary node */
+				dbg(event->udev, "tempnode: create temp node\n");
 				asprintf(&event->tmp_node, "%s/.tmp-%s-%u:%u",
 					 udev_get_dev_path(event->udev), devtype,
 					 major(udev_device_get_devnum(dev)),
@@ -394,13 +408,16 @@ found:
 			break;
 		case SUBST_LINKS:
 			{
+				size_t devlen = strlen(udev_get_dev_path(event->udev))+1;
 				struct udev_list_entry *list_entry;
 
 				list_entry = udev_device_get_devlinks_list_entry(dev);
-				util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+				if (list_entry == NULL)
+					break;
+				util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
 				udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
 					util_strlcat(string, " ", maxsize);
-					util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
+					util_strlcat(string, &udev_list_entry_get_name(list_entry)[devlen], maxsize);
 				}
 			}
 			break;
@@ -417,14 +434,11 @@ found:
 				dbg(event->udev, "missing attribute\n");
 				break;
 			} else {
-				struct udev_list_entry *list_entry;
 				const char *value;
 
-				list_entry = udev_device_get_properties_list_entry(event->dev);
-				list_entry = udev_list_entry_get_by_name(list_entry, attr);
-				if (list_entry == NULL)
+				value = udev_device_get_property_value(event->dev, attr);
+				if (value == NULL)
 					break;
-				value = udev_list_entry_get_value(list_entry);
 				dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
 				util_strlcat(string, value, maxsize);
 				break;
@@ -471,8 +485,6 @@ static int rename_netif(struct udev_event *event)
 
 	info(event->udev, "changing net interface name from '%s' to '%s'\n",
 	     udev_device_get_sysname(dev), event->name);
-	if (event->test)
-		return 0;
 
 	sk = socket(PF_INET, SOCK_DGRAM, 0);
 	if (sk < 0) {
@@ -506,10 +518,10 @@ static int rename_netif(struct udev_event *event)
 			goto exit;
 		}
 
-		/* wait 30 seconds for our target to become available */
+		/* wait 90 seconds for our target to become available */
 		util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
-		util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ);
-		loop = 30 * 20;
+		util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
+		loop = 90 * 20;
 		while (loop--) {
 			err = ioctl(sk, SIOCSIFNAME, &ifr);
 			if (err == 0) {
@@ -523,7 +535,7 @@ static int rename_netif(struct udev_event *event)
 				break;
 			}
 			dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-			    udev_device_get_devnode(dev), (30 * 20) - loop);
+			    event->name, (90 * 20) - loop);
 			usleep(1000 * 1000 / 20);
 		}
 	}
@@ -548,12 +560,23 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 	    (strcmp(udev_device_get_action(dev), "add") == 0 || strcmp(udev_device_get_action(dev), "change") == 0)) {
 		char filename[UTIL_PATH_SIZE];
 		struct udev_device *dev_old;
+		int delete_kdevnode = 0;
 
 		dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
 
+		/* read old database entry */
+		dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
+		if (dev_old != NULL) {
+			udev_device_read_db(dev_old);
+			udev_device_set_info_loaded(dev_old);
+
+			/* disable watch during event processing */
+			udev_watch_end(event->udev, dev_old);
+		}
+
 		udev_rules_apply_to_event(rules, event);
 		if (event->tmp_node != NULL) {
-			dbg(event->udev, "removing temporary device node\n");
+			dbg(event->udev, "cleanup temporary device node\n");
 			util_unlink_secure(event->udev, event->tmp_node);
 			free(event->tmp_node);
 			event->tmp_node = NULL;
@@ -561,20 +584,37 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
 		if (event->ignore_device) {
 			info(event->udev, "device event will be ignored\n");
-			goto exit;
+			delete_kdevnode = 1;
+			goto exit_add;
 		}
 
 		if (event->name != NULL && event->name[0] == '\0') {
 			info(event->udev, "device node creation supressed\n");
-			goto exit;
+			delete_kdevnode = 1;
+			goto exit_add;
 		}
 
+		/* if rule given name disagrees with kernel node name, delete kernel node */
+		if (event->name != NULL && udev_device_get_knodename(dev) != NULL) {
+			if (strcmp(event->name, udev_device_get_knodename(dev)) != 0)
+				delete_kdevnode = 1;
+		}
+
+		/* no rule, use kernel provided name */
 		if (event->name == NULL) {
-			info(event->udev, "no node name set, will use kernel name '%s'\n",
-			     udev_device_get_sysname(event->dev));
-			event->name = strdup(udev_device_get_sysname(event->dev));
-			if (event->name == NULL)
-				goto exit;
+			if (udev_device_get_knodename(dev) != NULL) {
+				event->name = strdup(udev_device_get_knodename(dev));
+				info(event->udev, "no node name set, will use kernel supplied name '%s'\n", event->name);
+			} else {
+				event->name = strdup(udev_device_get_sysname(event->dev));
+				info(event->udev, "no node name set, will use device name '%s'\n", event->name);
+			}
+		}
+
+		/* something went wrong */
+		if (event->name == NULL) {
+			err(event->udev, "no node name for '%s'\n", udev_device_get_sysname(event->dev));
+			goto exit_add;
 		}
 
 		/* set device node name */
@@ -583,28 +623,36 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 		util_strlcat(filename, event->name, sizeof(filename));
 		udev_device_set_devnode(dev, filename);
 
-		/* read current database entry */
-		dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
-		if (dev_old != NULL) {
-			udev_device_read_db(dev_old);
-			udev_device_set_info_loaded(dev_old);
-		}
-
-		/* update database, create node and symlinks */
+		/* write current database entry */
 		udev_device_update_db(dev);
-		err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
 
 		/* remove/update possible left-over symlinks from old database entry */
-		if (dev_old != NULL) {
-			udev_node_update_old_links(dev, dev_old, event->test);
-			udev_device_unref(dev_old);
+		if (dev_old != NULL)
+			udev_node_update_old_links(dev, dev_old);
+
+		/* create new node and symlinks */
+		err = udev_node_add(dev, event->mode, event->uid, event->gid);
+exit_add:
+		if (delete_kdevnode && udev_device_get_knodename(dev) != NULL) {
+			struct stat stats;
+
+			util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
+			util_strlcat(filename, "/", sizeof(filename));
+			util_strlcat(filename, udev_device_get_knodename(dev), sizeof(filename));
+			if (stat(filename, &stats) == 0 && stats.st_rdev == udev_device_get_devnum(dev)) {
+				unlink(filename);
+				util_delete_path(event->udev, filename);
+				info(event->udev, "removed kernel created node '%s'\n", filename);
+			}
 		}
+		udev_device_unref(dev_old);
 		goto exit;
 	}
 
 	/* add netif */
 	if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) {
 		dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev));
+		udev_device_delete_db(dev);
 
 		udev_rules_apply_to_event(rules, event);
 		if (event->ignore_device) {
@@ -638,6 +686,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 				info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
 			}
 		}
+		udev_device_update_db(dev);
 		goto exit;
 	}
 
@@ -648,6 +697,9 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 		udev_device_set_info_loaded(dev);
 		udev_device_delete_db(dev);
 
+		/* remove watch */
+		udev_watch_end(event->udev, dev);
+
 		if (udev_device_get_devnode(dev) == NULL) {
 			char devnode[UTIL_PATH_SIZE];
 
@@ -670,7 +722,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 			goto exit;
 		}
 
-		err = udev_node_remove(dev, event->test);
+		err = udev_node_remove(dev);
 		goto exit;
 	}
 
@@ -678,6 +730,11 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 	udev_rules_apply_to_event(rules, event);
 	if (event->ignore_device)
 		info(event->udev, "device event will be ignored\n");
+
+	if (strcmp(udev_device_get_action(dev), "remove") != 0)
+		udev_device_update_db(dev);
+	else
+		udev_device_delete_db(dev);
 exit:
 	return err;
 }