X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=dcd091485b8e74c433916941c5aabd9e000f8e73;hp=200b4e70242b9b1a6c94879d9d54d5c3a24a615b;hb=39ea7c6c67de69379b603196a0eff6f7ce2e469a;hpb=6e82f66ea263d432e483505566f8f13ae83f3ac5

diff --git a/udev_rules.c b/udev_rules.c
index 200b4e702..dcd091485 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -27,12 +27,15 @@
 #include <errno.h>
 #include <syslog.h>
 #include <fnmatch.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
 #include "udev.h"
 #include "udev_rules.h"
 
+extern char **environ;
 
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
@@ -79,68 +82,251 @@ static int get_key(char **line, char **key, char **value)
 	char *temp;
 
 	linepos = *line;
-	if (!linepos)
+	if (linepos == NULL)
 		return -1;
 
-	if (strchr(linepos, '\\')) {
-		dbg("escaped characters are not supported, skip");
-		return -1;
-	}
-
 	/* skip whitespace */
 	while (isspace(linepos[0]))
 		linepos++;
 
 	/* get the key */
+	temp = strchr(linepos, '=');
+	if (temp == NULL || temp == linepos)
+		return -1;
+	temp[0] = '\0';
 	*key = linepos;
-	while (1) {
-		linepos++;
-		if (linepos[0] == '\0')
-			return -1;
-		if (isspace(linepos[0]))
-			break;
-		if (linepos[0] == '=')
-			break;
+	linepos = &temp[1];
+
+	/* get a quoted value */
+	if (linepos[0] == '"' || linepos[0] == '\'') {
+		temp = strchr(&linepos[1], linepos[0]);
+		if (temp != NULL) {
+			temp[0] = '\0';
+			*value = &linepos[1];
+			goto out;
+		}
 	}
 
-	/* terminate key */
-	linepos[0] = '\0';
-	linepos++;
+	/* get the value*/
+	temp = strchr(linepos, '\n');
+	if (temp != NULL)
+		temp[0] = '\0';
+	*value = linepos;
+out:
+	return 0;
+}
 
-	/* skip whitespace */
-	while (isspace(linepos[0]))
-		linepos++;
+static int run_program(const char *command, const char *subsystem,
+		char *result, size_t ressize, size_t *reslen)
+{
+	int status;
+	int outpipe[2] = {-1, -1};
+	int errpipe[2] = {-1, -1};
+	pid_t pid;
+	char arg[PATH_SIZE];
+	char program[PATH_SIZE];
+	char *argv[(sizeof(arg) / 2) + 1];
+	int devnull;
+	int i;
+	int retval = 0;
+
+	/* build argv from comand */
+	strlcpy(arg, command, sizeof(arg));
+	i = 0;
+	if (strchr(arg, ' ') != NULL) {
+		char *pos = arg;
+
+		while (pos != NULL) {
+			if (pos[0] == '\'') {
+				/* don't separate if in apostrophes */
+				pos++;
+				argv[i] = strsep(&pos, "\'");
+				while (pos != NULL && pos[0] == ' ')
+					pos++;
+			} else {
+				argv[i] = strsep(&pos, " ");
+			}
+			dbg("arg[%i] '%s'", i, argv[i]);
+			i++;
+		}
+		argv[i] = NULL;
+	} else {
+		argv[0] = arg;
+		argv[1] = NULL;
+	}
+	info("'%s'", command);
 
-	/* get the value*/
-	if (linepos[0] == '"') {
-		linepos++;
-		temp = strchr(linepos, '"');
-		if (!temp) {
-			dbg("missing closing quote");
+	/* prepare pipes from child to parent */
+	if (result != NULL || udev_log_priority >= LOG_INFO) {
+		if (pipe(outpipe) != 0) {
+			err("pipe failed: %s", strerror(errno));
 			return -1;
 		}
-		dbg("value is quoted");
-		temp[0] = '\0';
-	} else if (linepos[0] == '\'') {
-		linepos++;
-		temp = strchr(linepos, '\'');
-		if (!temp) {
-			dbg("missing closing quote");
+	}
+	if (udev_log_priority >= LOG_INFO) {
+		if (pipe(errpipe) != 0) {
+			err("pipe failed: %s", strerror(errno));
 			return -1;
 		}
-		dbg("value is quoted");
-		temp[0] = '\0';
-	} else if (linepos[0] == '\0') {
-		dbg("value is empty");
-	} else {
-		temp = linepos;
-		while (temp[0] && !isspace(temp[0]))
-			temp++;
-		temp[0] = '\0';
 	}
-	*value = linepos;
 
-	return 0;
+	/* allow programs in /lib/udev called without the path */
+	if (strchr(argv[0], '/') == NULL) {
+		strlcpy(program, "/lib/udev/", sizeof(program));
+		strlcat(program, argv[0], sizeof(program));
+		argv[0] = program;
+	}
+
+	pid = fork();
+	switch(pid) {
+	case 0:
+		/* child closes parent ends of pipes */
+		if (outpipe[READ_END] > 0)
+			close(outpipe[READ_END]);
+		if (errpipe[READ_END] > 0)
+			close(errpipe[READ_END]);
+
+		/* discard child output or connect to pipe */
+		devnull = open("/dev/null", O_RDWR);
+		if (devnull > 0) {
+			dup2(devnull, STDIN_FILENO);
+			if (outpipe[WRITE_END] < 0)
+				dup2(devnull, STDOUT_FILENO);
+			if (errpipe[WRITE_END] < 0)
+				dup2(devnull, STDERR_FILENO);
+			close(devnull);
+		} else
+			err("open /dev/null failed: %s", strerror(errno));
+		if (outpipe[WRITE_END] > 0) {
+			dup2(outpipe[WRITE_END], STDOUT_FILENO);
+			close(outpipe[WRITE_END]);
+		}
+		if (errpipe[WRITE_END] > 0) {
+			dup2(errpipe[WRITE_END], STDERR_FILENO);
+			close(errpipe[WRITE_END]);
+		}
+		execv(argv[0], argv);
+		if (errno == ENOENT || errno == ENOTDIR) {
+			/* may be on a filesytem which is not mounted right now */
+			info("program '%s' not found", argv[0]);
+		} else {
+			/* other problems */
+			err("exec of program '%s' failed", argv[0]);
+		}
+		_exit(1);
+	case -1:
+		err("fork of '%s' failed: %s", argv[0], strerror(errno));
+		return -1;
+	default:
+		/* read from child if requested */
+		if (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+			ssize_t count;
+			size_t respos = 0;
+
+			/* parent closes child ends of pipes */
+			if (outpipe[WRITE_END] > 0)
+				close(outpipe[WRITE_END]);
+			if (errpipe[WRITE_END] > 0)
+				close(errpipe[WRITE_END]);
+
+			/* read child output */
+			while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+				int fdcount;
+				fd_set readfds;
+
+				FD_ZERO(&readfds);
+				if (outpipe[READ_END] > 0)
+					FD_SET(outpipe[READ_END], &readfds);
+				if (errpipe[READ_END] > 0)
+					FD_SET(errpipe[READ_END], &readfds);
+				fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
+				if (fdcount < 0) {
+					if (errno == EINTR)
+						continue;
+					retval = -1;
+					break;
+				}
+
+				/* get stdout */
+				if (outpipe[READ_END] > 0 && FD_ISSET(outpipe[READ_END], &readfds)) {
+					char inbuf[1024];
+					char *pos;
+					char *line;
+
+					count = read(outpipe[READ_END], inbuf, sizeof(inbuf)-1);
+					if (count <= 0) {
+						close(outpipe[READ_END]);
+						outpipe[READ_END] = -1;
+						if (count < 0) {
+							err("stdin read failed: %s", strerror(errno));
+							retval = -1;
+						}
+						continue;
+					}
+					inbuf[count] = '\0';
+
+					/* store result for rule processing */
+					if (result) {
+						if (respos + count < ressize) {
+							memcpy(&result[respos], inbuf, count);
+							respos += count;
+						} else {
+							err("ressize %ld too short", (long)ressize);
+							retval = -1;
+						}
+					}
+					pos = inbuf;
+					while ((line = strsep(&pos, "\n")))
+						if (pos || line[0] != '\0')
+							info("'%s' (stdout) '%s'", argv[0], line);
+				}
+
+				/* get stderr */
+				if (errpipe[READ_END] > 0 && FD_ISSET(errpipe[READ_END], &readfds)) {
+					char errbuf[1024];
+					char *pos;
+					char *line;
+
+					count = read(errpipe[READ_END], errbuf, sizeof(errbuf)-1);
+					if (count <= 0) {
+						close(errpipe[READ_END]);
+						errpipe[READ_END] = -1;
+						if (count < 0)
+							err("stderr read failed: %s", strerror(errno));
+						continue;
+					}
+					errbuf[count] = '\0';
+					pos = errbuf;
+					while ((line = strsep(&pos, "\n")))
+						if (pos || line[0] != '\0')
+							info("'%s' (stderr) '%s'", argv[0], line);
+				}
+			}
+			if (outpipe[READ_END] > 0)
+				close(outpipe[READ_END]);
+			if (errpipe[READ_END] > 0)
+				close(errpipe[READ_END]);
+
+			/* return the childs stdout string */
+			if (result) {
+				result[respos] = '\0';
+				dbg("result='%s'", result);
+				if (reslen)
+					*reslen = respos;
+			}
+		}
+		waitpid(pid, &status, 0);
+		if (WIFEXITED(status)) {
+			info("'%s' returned with status %i", argv[0], WEXITSTATUS(status));
+			if (WEXITSTATUS(status) != 0)
+				retval = -1;
+		} else {
+			err("'%s' abnormal exit", argv[0]);
+			retval = -1;
+		}
+	}
+
+	return retval;
 }
 
 static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
@@ -186,7 +372,13 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
 		linepos = line;
 		if (get_key(&linepos, &variable, &value) == 0) {
 			dbg("import '%s=%s'", variable, value);
-			name_list_key_add(&udev->env_list, variable, value);
+
+			/* handle device, renamed by external tool, returning new path */
+			if (strcmp(variable, "DEVPATH") == 0) {
+				info("updating devpath from '%s' to '%s'", udev->dev->devpath, value);
+				sysfs_device_set_values(udev->dev, value, NULL, NULL);
+			} else
+				name_list_key_add(&udev->env_list, variable, value);
 			setenv(variable, value, 1);
 		}
 	}
@@ -211,10 +403,10 @@ static int import_file_into_env(struct udevice *udev, const char *filename)
 
 static int import_program_into_env(struct udevice *udev, const char *program)
 {
-	char result[1024];
+	char result[2048];
 	size_t reslen;
 
-	if (run_program(program, udev->dev->subsystem, result, sizeof(result), &reslen, (udev_log_priority >= LOG_INFO)) != 0)
+	if (run_program(program, udev->dev->subsystem, result, sizeof(result), &reslen) != 0)
 		return -1;
 	return import_keys_into_env(udev, result, reslen);
 }
@@ -230,7 +422,7 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
 		struct name_entry *name_loop;
 
 		dbg("found parent '%s', get the node name", dev_parent->devpath);
-		udev_parent = udev_device_init();
+		udev_parent = udev_device_init(NULL);
 		if (udev_parent == NULL)
 			return -1;
 		/* import the udev_db of the parent */
@@ -262,6 +454,66 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
 	return rc;
 }
 
+static int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
+{
+	int sock;
+	struct sockaddr_un saddr;
+	socklen_t addrlen;
+	char buf[2048];
+	size_t bufpos = 0;
+	int i;
+	ssize_t count;
+	int retval = 0;
+
+	dbg("pass environment to socket '%s'", sockname);
+	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+	saddr.sun_family = AF_LOCAL;
+	/* abstract namespace only */
+	strcpy(&saddr.sun_path[1], sockname);
+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+	bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+	bufpos++;
+	for (i = 0; environ[i] != NULL && bufpos < (sizeof(buf)-1); i++) {
+		bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+		bufpos++;
+	}
+	if (bufpos > sizeof(buf))
+		bufpos = sizeof(buf);
+
+	count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+	if (count < 0)
+		retval = -1;
+	info("passed %zi bytes to socket '%s', ", count, sockname);
+
+	close(sock);
+	return retval;
+}
+
+int udev_rules_run(struct udevice *udev)
+{
+	struct name_entry *name_loop;
+	int retval = 0;
+
+	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) != 0)
+				if (!name_loop->ignore_error)
+					retval = -1;
+		}
+	}
+
+	return retval;
+}
+
 #define WAIT_LOOP_PER_SECOND		50
 static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 {
@@ -283,7 +535,7 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 			info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
 			return 0;
 		}
-		/* make sure the device does not have disappeared in the meantime */
+		/* make sure, the device did not disappear in the meantime */
 		if (stat(devicepath, &stats) != 0) {
 			info("device disappeared while waiting for '%s'", filepath);
 			return -2;
@@ -291,10 +543,48 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
 		info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND);
 		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
 	}
-	err("waiting for '%s' failed", filepath);
+	info("waiting for '%s' failed", filepath);
 	return -1;
 }
 
+/* handle "[$SUBSYSTEM/$KERNEL]<attribute>" lookup */
+static int attr_get_by_subsys_id(const char *attrstr, char *devpath, size_t len, char **attr)
+{
+	char subsys[NAME_SIZE];
+	char *attrib;
+	char *id;
+	int found = 0;
+
+	if (attrstr[0] != '[')
+		goto out;
+
+	strlcpy(subsys, &attrstr[1], sizeof(subsys));
+
+	attrib = strchr(subsys, ']');
+	if (attrib == NULL)
+		goto out;
+	attrib[0] = '\0';
+	attrib = &attrib[1];
+
+	id = strchr(subsys, '/');
+	if (id == NULL)
+		goto out;
+	id[0] = '\0';
+	id = &id[1];
+
+	if (sysfs_lookup_devpath_by_subsys_id(devpath, len, subsys, id)) {
+		if (attr != NULL) {
+			if (attrib[0] != '\0')
+				*attr = attrib;
+			else
+				*attr = NULL;
+		}
+		found = 1;
+	}
+out:
+	return found;
+}
+
 void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 {
 	char temp[PATH_SIZE];
@@ -309,13 +599,16 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		SUBST_KERNEL,
 		SUBST_KERNEL_NUMBER,
 		SUBST_ID,
+		SUBST_DRIVER,
 		SUBST_MAJOR,
 		SUBST_MINOR,
 		SUBST_RESULT,
 		SUBST_ATTR,
 		SUBST_PARENT,
 		SUBST_TEMP_NODE,
+		SUBST_NAME,
 		SUBST_ROOT,
+		SUBST_SYS,
 		SUBST_ENV,
 	};
 	static const struct subst_map {
@@ -327,6 +620,7 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "number",	.fmt = 'n',	.type = SUBST_KERNEL_NUMBER },
 		{ .name = "kernel",	.fmt = 'k',	.type = SUBST_KERNEL },
 		{ .name = "id",		.fmt = 'b',	.type = SUBST_ID },
+		{ .name = "driver",	.fmt = 'd',	.type = SUBST_DRIVER },
 		{ .name = "major",	.fmt = 'M',	.type = SUBST_MAJOR },
 		{ .name = "minor",	.fmt = 'm',	.type = SUBST_MINOR },
 		{ .name = "result",	.fmt = 'c',	.type = SUBST_RESULT },
@@ -334,7 +628,9 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 		{ .name = "sysfs",	.fmt = 's',	.type = SUBST_ATTR },
 		{ .name = "parent",	.fmt = 'P',	.type = SUBST_PARENT },
 		{ .name = "tempnode",	.fmt = 'N',	.type = SUBST_TEMP_NODE },
+		{ .name = "name",	.fmt = 'D',	.type = SUBST_NAME },
 		{ .name = "root",	.fmt = 'r',	.type = SUBST_ROOT },
+		{ .name = "sys",	.fmt = 'S',	.type = SUBST_SYS },
 		{ .name = "env",	.fmt = 'E',	.type = SUBST_ENV },
 		{ NULL, '\0', 0 }
 	};
@@ -417,6 +713,12 @@ found:
 				dbg("substitute id '%s'", udev->dev_parent->kernel);
 			}
 			break;
+		case SUBST_DRIVER:
+			if (udev->dev_parent != NULL) {
+				strlcat(string, udev->dev_parent->driver, maxsize);
+				dbg("substitute driver '%s'", udev->dev_parent->driver);
+			}
+			break;
 		case SUBST_MAJOR:
 			sprintf(temp2, "%d", major(udev->devt));
 			strlcat(string, temp2, maxsize);
@@ -465,11 +767,20 @@ found:
 			if (attr == NULL)
 				err("missing file parameter for attr");
 			else {
+				char devpath[PATH_SIZE];
+				char *attrib;
 				const char *value = NULL;
 				size_t size;
 
-				/* first try the current device, other matches may have selected */
-				if (udev->dev_parent != NULL && udev->dev_parent != udev->dev)
+				if (attr_get_by_subsys_id(attr, devpath, sizeof(devpath), &attrib)) {
+					if (attrib != NULL)
+						value = sysfs_attr_get_value(devpath, attrib);
+					else
+						break;
+				}
+
+				/* try the current device, other matches may have selected */
+				if (value == NULL && udev->dev_parent != NULL && udev->dev_parent != udev->dev)
 					value = sysfs_attr_get_value(udev->dev_parent->devpath, attr);
 
 				/* look at all devices along the chain of parents */
@@ -490,15 +801,15 @@ found:
 				if (value == NULL)
 					break;
 
-				/* strip trailing whitespace and replace untrusted characters of sysfs value */
+				/* strip trailing whitespace, and replace unwanted characters */
 				size = strlcpy(temp2, value, sizeof(temp2));
 				if (size >= sizeof(temp2))
 					size = sizeof(temp2)-1;
 				while (size > 0 && isspace(temp2[size-1]))
 					temp2[--size] = '\0';
-				count = replace_untrusted_chars(temp2);
+				count = replace_chars(temp2, ALLOWED_CHARS_INPUT);
 				if (count > 0)
-					info("%i untrusted character(s) replaced" , count);
+					info("%i character(s) replaced" , count);
 				strlcat(string, temp2, maxsize);
 				dbg("substitute sysfs value '%s'", temp2);
 			}
@@ -512,7 +823,7 @@ found:
 					struct udevice *udev_parent;
 
 					dbg("found parent '%s', get the node name", dev_parent->devpath);
-					udev_parent = udev_device_init();
+					udev_parent = udev_device_init(NULL);
 					if (udev_parent != NULL) {
 						/* lookup the name in the udev_db with the DEVPATH of the parent */
 						if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) {
@@ -526,7 +837,7 @@ found:
 			}
 			break;
 		case SUBST_TEMP_NODE:
-			if (udev->tmp_node[0] == '\0') {
+			if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) {
 				dbg("create temporary device node for callout");
 				snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
 					 udev_root, major(udev->devt), minor(udev->devt));
@@ -536,10 +847,18 @@ found:
 			strlcat(string, udev->tmp_node, maxsize);
 			dbg("substitute temporary device node name '%s'", udev->tmp_node);
 			break;
+		case SUBST_NAME:
+			strlcat(string, udev->name, maxsize);
+			dbg("substitute udev->name '%s'", udev->name);
+			break;
 		case SUBST_ROOT:
 			strlcat(string, udev_root, maxsize);
 			dbg("substitute udev_root '%s'", udev_root);
 			break;
+		case SUBST_SYS:
+			strlcat(string, sysfs_path, maxsize);
+			dbg("substitute sysfs_path '%s'", sysfs_path);
+			break;
 		case SUBST_ENV:
 			if (attr == NULL) {
 				dbg("missing attribute");
@@ -578,18 +897,18 @@ static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
 
 static int match_key(const char *key_name, struct udev_rule *rule, struct key *key, const char *val)
 {
-	int match;
 	char value[PATH_SIZE];
 	char *key_value;
 	char *pos;
+	int match = 0;
 
 	if (key->operation != KEY_OP_MATCH &&
 	    key->operation != KEY_OP_NOMATCH)
 		return 0;
 
+	/* look for a matching string, parts are separated by '|' */
 	strlcpy(value, rule->buf + key->val_off, sizeof(value));
 	key_value = value;
-
 	dbg("key %s value='%s'", key_name, key_value);
 	while (key_value) {
 		pos = strchr(key_value, '|');
@@ -597,19 +916,23 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
 			pos[0] = '\0';
 			pos++;
 		}
+
 		dbg("match %s '%s' <-> '%s'", key_name, key_value, val);
 		match = (fnmatch(key_value, val, 0) == 0);
-		if (match && (key->operation != KEY_OP_NOMATCH)) {
-			dbg("%s is true (matching value)", key_name);
-			return 0;
-		}
-		if (!match && (key->operation == KEY_OP_NOMATCH)) {
-			dbg("%s is true (non-matching value)", key_name);
-			return 0;
-		}
+		if (match)
+			break;
+
 		key_value = pos;
 	}
-	dbg("%s is false", key_name);
+
+	if (match && (key->operation == KEY_OP_MATCH)) {
+		dbg("%s is true (matching value)", key_name);
+		return 0;
+	}
+	if (!match && (key->operation == KEY_OP_NOMATCH)) {
+		dbg("%s is true (non-matching value)", key_name);
+		return 0;
+	}
 	return -1;
 }
 
@@ -637,6 +960,22 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 	if (match_key("NAME", rule, &rule->name, udev->name))
 		goto nomatch;
 
+	/* match against current list of symlinks */
+	if (rule->symlink_match.operation == KEY_OP_MATCH ||
+	    rule->symlink_match.operation == KEY_OP_NOMATCH) {
+		struct name_entry *name_loop;
+		int match = 0;
+
+		list_for_each_entry(name_loop, &udev->symlink_list, node) {
+			if (match_key("SYMLINK", rule, &rule->symlink_match, name_loop->name) == 0) {
+				match = 1;
+				break;
+			}
+		}
+		if (!match)
+			goto nomatch;
+	}
+
 	for (i = 0; i < rule->env.count; i++) {
 		struct key_pair *pair = &rule->env.keys[i];
 
@@ -655,10 +994,53 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		}
 	}
 
+	if (rule->test.operation == KEY_OP_MATCH ||
+	    rule->test.operation == KEY_OP_NOMATCH) {
+		char filename[PATH_SIZE];
+		char devpath[PATH_SIZE];
+		char *attr;
+		struct stat statbuf;
+		int match;
+
+		strlcpy(filename, key_val(rule, &rule->test), sizeof(filename));
+		udev_rules_apply_format(udev, filename, sizeof(filename));
+
+		if (attr_get_by_subsys_id(filename, devpath, sizeof(devpath), &attr)) {
+			strlcpy(filename, sysfs_path, sizeof(filename));
+			strlcat(filename, devpath, sizeof(filename));
+			if (attr != NULL) {
+				strlcat(filename, "/", sizeof(filename));
+				strlcat(filename, attr, sizeof(filename));
+			}
+		} else if (filename[0] != '/') {
+			char tmp[PATH_SIZE];
+
+			strlcpy(tmp, sysfs_path, sizeof(tmp));
+			strlcat(tmp, udev->dev->devpath, sizeof(tmp));
+			strlcat(tmp, "/", sizeof(tmp));
+			strlcat(tmp, filename, sizeof(tmp));
+			strlcpy(filename, tmp, sizeof(filename));
+		}
+
+		match = (stat(filename, &statbuf) == 0);
+		info("'%s' %s", filename, match ? "exists" : "does not exist");
+		if (match && rule->test_mode_mask > 0) {
+			match = ((statbuf.st_mode & rule->test_mode_mask) > 0);
+			info("'%s' has mode=%#o and %s %#o", filename, statbuf.st_mode,
+			     match ? "matches" : "does not match",
+			     rule->test_mode_mask);
+		}
+		if (match && rule->test.operation == KEY_OP_NOMATCH)
+			goto nomatch;
+		if (!match && rule->test.operation == KEY_OP_MATCH)
+			goto nomatch;
+		dbg("TEST key is true");
+	}
+
 	if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
 		int found;
 
-		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
+		found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 10) == 0);
 		if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
 			goto nomatch;
 	}
@@ -671,11 +1053,20 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 		    pair->key.operation == KEY_OP_NOMATCH) {
 			const char *key_name = key_pair_name(rule, pair);
 			const char *key_value = key_val(rule, &pair->key);
-			const char *value;
+			char devpath[PATH_SIZE];
+			char *attrib;
+			const char *value = NULL;
 			char val[VALUE_SIZE];
 			size_t len;
 
-			value = sysfs_attr_get_value(udev->dev->devpath, key_name);
+			if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+				if (attrib != NULL)
+					value = sysfs_attr_get_value(devpath, attrib);
+				else
+					goto nomatch;
+			}
+			if (value == NULL)
+				value = sysfs_attr_get_value(udev->dev->devpath, key_name);
 			if (value == NULL)
 				goto nomatch;
 			strlcpy(val, value, sizeof(val));
@@ -761,7 +1152,7 @@ try_parent:
 
 		strlcpy(program, key_val(rule, &rule->program), sizeof(program));
 		udev_rules_apply_format(udev, program, sizeof(program));
-		if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
+		if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL) != 0) {
 			dbg("PROGRAM is false");
 			udev->program_result[0] = '\0';
 			if (rule->program.operation != KEY_OP_NOMATCH)
@@ -771,9 +1162,12 @@ try_parent:
 
 			dbg("PROGRAM matches");
 			remove_trailing_chars(result, '\n');
-			count = replace_untrusted_chars(result);
-			if (count)
-				info("%i untrusted character(s) replaced" , count);
+			if (rule->string_escape == ESCAPE_UNSET ||
+			    rule->string_escape == ESCAPE_REPLACE) {
+				count = replace_chars(result, ALLOWED_CHARS_INPUT);
+				if (count > 0)
+					info("%i character(s) replaced" , count);
+			}
 			dbg("result is '%s'", result);
 			strlcpy(udev->program_result, result, sizeof(udev->program_result));
 			dbg("PROGRAM returned successful");
@@ -821,42 +1215,63 @@ try_parent:
 			char temp_value[NAME_SIZE];
 			const char *key_name = key_pair_name(rule, pair);
 			const char *value = key_val(rule, &pair->key);
-			char *key_value;
 
 			/* make sure we don't write to the same string we possibly read from */
 			strlcpy(temp_value, value, sizeof(temp_value));
 			udev_rules_apply_format(udev, temp_value, NAME_SIZE);
 
-			key_value = name_list_key_add(&udev->env_list, key_name, temp_value);
-			if (key_value == NULL)
-				break;
+			if (temp_value[0] == '\0') {
+				name_list_key_remove(&udev->env_list, key_name);
+				unsetenv(key_name);
+				info("unset ENV '%s'", key_name);
+			} else {
+				struct name_entry *entry;
 
-			putenv(key_value);
-			dbg("export ENV '%s'", key_value);
+				entry = name_list_key_add(&udev->env_list, key_name, temp_value);
+				if (entry == NULL)
+					break;
+				putenv(entry->name);
+				info("set ENV '%s'", entry->name);
+			}
 		}
 	}
 
-	/* if we have ATTR assignements write value to sysfs file */
+	/* if we have ATTR assignments, write value to sysfs file */
 	for (i = 0; i < rule->attr.count; i++) {
 		struct key_pair *pair = &rule->attr.keys[i];
 
 		if (pair->key.operation == KEY_OP_ASSIGN) {
 			const char *key_name = key_pair_name(rule, pair);
-			char attr[PATH_SIZE];
+			char devpath[PATH_SIZE];
+			char *attrib;
+			char attr[PATH_SIZE] = "";
 			char value[NAME_SIZE];
 			FILE *f;
 
-			strlcpy(attr, sysfs_path, sizeof(attr));
-			strlcat(attr, udev->dev->devpath, sizeof(attr));
-			strlcat(attr, "/", sizeof(attr));
-			strlcat(attr, key_name, sizeof(attr));
+			if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+				if (attrib != NULL) {
+					strlcpy(attr, sysfs_path, sizeof(attr));
+					strlcat(attr, devpath, sizeof(attr));
+					strlcat(attr, "/", sizeof(attr));
+					strlcat(attr, attrib, sizeof(attr));
+				}
+			}
+
+			if (attr[0] == '\0') {
+				strlcpy(attr, sysfs_path, sizeof(attr));
+				strlcat(attr, udev->dev->devpath, sizeof(attr));
+				strlcat(attr, "/", sizeof(attr));
+				strlcat(attr, key_name, sizeof(attr));
+			}
+
 			strlcpy(value, key_val(rule, &pair->key), sizeof(value));
 			udev_rules_apply_format(udev, value, sizeof(value));
 			info("writing '%s' to sysfs file '%s'", value, attr);
 			f = fopen(attr, "w");
 			if (f != NULL) {
-				if (fprintf(f, "%s", value) <= 0)
-					err("error writing ATTR{%s}: %s", attr, strerror(errno));
+				if (!udev->test_run)
+					if (fprintf(f, "%s", value) <= 0)
+						err("error writing ATTR{%s}: %s", attr, strerror(errno));
 				fclose(f);
 			} else
 				err("error opening ATTR{%s} for writing: %s", attr, strerror(errno));
@@ -903,6 +1318,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_remove = 1;
 				dbg("remove event should be ignored");
 			}
+			if (rule->link_priority != 0) {
+				udev->link_priority = rule->link_priority;
+				info("link_priority=%i", udev->link_priority);
+			}
 			/* apply all_partitions option only at a main block device */
 			if (rule->partitions &&
 			    strcmp(udev->dev->subsystem, "block") == 0 && udev->dev->kernel_number[0] == '\0') {
@@ -933,25 +1352,31 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 			}
 
 			/* collect symlinks */
-			if (!udev->symlink_final && rule->symlink.operation != KEY_OP_UNSET) {
+			if (!udev->symlink_final &&
+			    (rule->symlink.operation == KEY_OP_ASSIGN ||
+			     rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+			     rule->symlink.operation == KEY_OP_ADD)) {
 				char temp[PATH_SIZE];
 				char *pos, *next;
 				int count;
 
 				if (rule->symlink.operation == KEY_OP_ASSIGN_FINAL)
 					udev->symlink_final = 1;
-				if (rule->symlink.operation == KEY_OP_ASSIGN || rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
+				if (rule->symlink.operation == KEY_OP_ASSIGN ||
+				    rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset symlink list");
 					name_list_cleanup(&udev->symlink_list);
 				}
+				/* allow  multiple symlinks separated by spaces */
 				strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
 				udev_rules_apply_format(udev, temp, sizeof(temp));
-				count = replace_untrusted_chars(temp);
-				if (count)
-					info("%i untrusted character(s) replaced" , count);
+				if (rule->string_escape == ESCAPE_UNSET ||
+				    rule->string_escape == ESCAPE_REPLACE) {
+					count = replace_chars(temp, ALLOWED_CHARS_FILE " ");
+					if (count > 0)
+						info("%i character(s) replaced" , count);
+				}
 				dbg("rule applied, added symlink(s) '%s'", temp);
-
-				/* add multiple symlinks separated by spaces */
 				pos = temp;
 				while (isspace(pos[0]))
 					pos++;
@@ -980,9 +1405,12 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 				name_set = 1;
 				strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
 				udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
-				count = replace_untrusted_chars(udev->name);
-				if (count)
-					info("%i untrusted character(s) replaced", count);
+				if (rule->string_escape == ESCAPE_UNSET ||
+				    rule->string_escape == ESCAPE_REPLACE) {
+					count = replace_chars(udev->name, ALLOWED_CHARS_FILE);
+					if (count > 0)
+						info("%i character(s) replaced", count);
+				}
 
 				info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name);
 				if (strcmp(udev->dev->subsystem, "net") != 0)
@@ -991,6 +1419,8 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
+				struct name_entry *entry;
+
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					udev->run_final = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
@@ -998,7 +1428,9 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 					name_list_cleanup(&udev->run_list);
 				}
 				dbg("add run '%s'", key_val(rule, &rule->run));
-				name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				if (rule->run_ignore_error)
+					entry->ignore_error = 1;
 			}
 
 			if (rule->last_rule) {
@@ -1014,8 +1446,8 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
 	}
 
 	if (!name_set) {
-		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 		info("no node name set, will use kernel name '%s'", udev->name);
+		strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 	}
 
 	if (udev->tmp_node[0] != '\0') {
@@ -1041,8 +1473,14 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 			break;
 
 		dbg("process rule");
-		if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-		    rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
+		if (rule->name.operation == KEY_OP_ASSIGN ||
+		    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->name.operation == KEY_OP_ADD ||
+		    rule->symlink.operation == KEY_OP_ASSIGN ||
+		    rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+		    rule->symlink.operation == KEY_OP_ADD ||
+		    rule->mode_operation != KEY_OP_UNSET ||
+		    rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
 			dbg("skip rule that names a device");
 			continue;
 		}
@@ -1053,14 +1491,23 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 				udev->ignore_device = 1;
 				return 0;
 			}
+			if (rule->ignore_remove) {
+				udev->ignore_remove = 1;
+				dbg("remove event should be ignored");
+			}
 
 			if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-				if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
+				struct name_entry *entry;
+
+				if (rule->run.operation == KEY_OP_ASSIGN ||
+				    rule->run.operation == KEY_OP_ASSIGN_FINAL) {
 					info("reset run list");
 					name_list_cleanup(&udev->run_list);
 				}
 				dbg("add run '%s'", key_val(rule, &rule->run));
-				name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+				if (rule->run_ignore_error)
+					entry->ignore_error = 1;
 				if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
 					break;
 			}