X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=5119b7e84f4b94e441bfdc7424aed46e955ae184;hp=91cc9744fb6cb044e643a62906dbbd9cd628395b;hb=661a0bea80d129d5df708e36dbaed745c9d8392e;hpb=b1c4f377c4989e0d881778b5a61f0d08b05c0a24

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 91cc9744f..5119b7e84 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -1,8 +1,6 @@
 /*
- * udev_rules_parse.c
- *
  * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -15,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -30,11 +28,12 @@
 
 #include "udev.h"
 #include "udev_rules.h"
+#include "udev_selinux.h"
 
 
 void udev_rules_iter_init(struct udev_rules *rules)
 {
-	dbg("bufsize=%zi", rules->bufsize);
+	dbg("bufsize=%zi\n", rules->bufsize);
 	rules->current = 0;
 }
 
@@ -45,9 +44,9 @@ struct udev_rule *udev_rules_iter_next(struct udev_rules *rules)
 	if (!rules)
 		return NULL;
 
-	dbg("current=%zi", rules->current);
+	dbg("current=%zi\n", rules->current);
 	if (rules->current >= rules->bufsize) {
-		dbg("no more rules");
+		dbg("no more rules\n");
 		return NULL;
 	}
 
@@ -63,20 +62,20 @@ struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *la
 	static struct udev_rule *rule;
 
 next:
-	dbg("current=%zi", rules->current);
+	dbg("current=%zi\n", rules->current);
 	if (rules->current >= rules->bufsize) {
-		dbg("no more rules");
+		dbg("no more rules\n");
 		return NULL;
 	}
 	rule = (struct udev_rule *) (rules->buf + rules->current);
 
 	if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
-		dbg("moving forward, looking for label '%s'", label);
+		dbg("moving forward, looking for label '%s'\n", label);
 		rules->current += sizeof(struct udev_rule) + rule->bufsize;
 		goto next;
 	}
 
-	dbg("found label '%s'", label);
+	dbg("found label '%s'\n", label);
 	return rule;
 }
 
@@ -106,12 +105,9 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 			break;
 		if (linepos[0] == '=')
 			break;
-		if (linepos[0] == '+')
-			break;
-		if (linepos[0] == '!')
-			break;
-		if (linepos[0] == ':')
-			break;
+		if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+			if (linepos[1] == '=')
+				break;
 	}
 
 	/* remember end of key */
@@ -127,29 +123,29 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 	if (linepos[0] == '=' && linepos[1] == '=') {
 		*operation = KEY_OP_MATCH;
 		linepos += 2;
-		dbg("operator=match");
+		dbg("operator=match\n");
 	} else if (linepos[0] == '!' && linepos[1] == '=') {
 		*operation = KEY_OP_NOMATCH;
 		linepos += 2;
-		dbg("operator=nomatch");
+		dbg("operator=nomatch\n");
 	} else if (linepos[0] == '+' && linepos[1] == '=') {
 		*operation = KEY_OP_ADD;
 		linepos += 2;
-		dbg("operator=add");
+		dbg("operator=add\n");
 	} else if (linepos[0] == '=') {
 		*operation = KEY_OP_ASSIGN;
 		linepos++;
-		dbg("operator=assign");
+		dbg("operator=assign\n");
 	} else if (linepos[0] == ':' && linepos[1] == '=') {
 		*operation = KEY_OP_ASSIGN_FINAL;
 		linepos += 2;
-		dbg("operator=assign_final");
+		dbg("operator=assign_final\n");
 	} else
 		return -1;
 
 	/* terminate key */
 	temp[0] = '\0';
-	dbg("key='%s'", *key);
+	dbg("key='%s'\n", *key);
 
 	/* skip whitespace after operator */
 	while (isspace(linepos[0]))
@@ -169,7 +165,7 @@ static int get_key(char **line, char **key, enum key_operation *operation, char
 		return -1;
 	temp[0] = '\0';
 	temp++;
-	dbg("value='%s'", *value);
+	dbg("value='%s'\n", *value);
 
 	/* move line to next key */
 	*line = temp;
@@ -188,11 +184,11 @@ static char *get_key_attribute(char *str)
 		attr++;
 		pos = strchr(attr, '}');
 		if (pos == NULL) {
-			err("missing closing brace for format");
+			err("missing closing brace for format\n");
 			return NULL;
 		}
 		pos[0] = '\0';
-		dbg("attribute='%s'", attr);
+		dbg("attribute='%s'\n", attr);
 		return attr;
 	}
 
@@ -219,7 +215,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
 	size_t key_len = strnlen(key, PATH_SIZE);
 
 	if (pairs->count >= PAIRS_MAX) {
-		err("skip, too many keys in a single rule");
+		err("skip, too many keys of the same type in a single rule\n");
 		return -1;
 	}
 
@@ -237,23 +233,23 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
 
 static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
+	char buf[sizeof(struct udev_rule) + LINE_SIZE];
 	struct udev_rule *rule;
 	size_t rule_size;
 	int valid;
 	char *linepos;
 	char *attr;
 	size_t padding;
+	int physdev = 0;
 	int retval;
 
-	/* get all the keys */
-	rule = calloc(1, sizeof (struct udev_rule) + LINE_SIZE);
-	if (!rule) {
-		err("malloc failed");
-		return -1;
-	}
+	memset(buf, 0x00, sizeof(buf));
+	rule = (struct udev_rule *) buf;
+	rule->event_timeout = -1;
 	linepos = line;
 	valid = 0;
 
+	/* get all the keys */
 	while (1) {
 		char *key;
 		char *value;
@@ -263,14 +259,24 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		if (retval)
 			break;
 
-		if (strcasecmp(key, "LABEL") == 0) {
-			add_rule_key(rule, &rule->label, operation, value);
+		if (strcasecmp(key, "ACTION") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid ACTION operation\n");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->action, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "GOTO") == 0) {
-			add_rule_key(rule, &rule->goto_label, operation, value);
+		if (strcasecmp(key, "DEVPATH") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DEVPATH operation\n");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->devpath, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -278,10 +284,10 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		if (strcasecmp(key, "KERNEL") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid KERNEL operation");
+				err("invalid KERNEL operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->kernel_name, operation, value);
+			add_rule_key(rule, &rule->kernel, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -289,113 +295,152 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		if (strcasecmp(key, "SUBSYSTEM") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid SUBSYSTEM operation");
+				err("invalid SUBSYSTEM operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->subsystem, operation, value);
+			/* bus, class, subsystem events should all be the same */
+			if (strcmp(value, "subsystem") == 0 ||
+			    strcmp(value, "bus") == 0 ||
+			    strcmp(value, "class") == 0) {
+				if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
+					err("'%s' must be specified as 'subsystem' \n"
+					    "please fix it in %s:%u", value, filename, lineno);
+				add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
+			} else
+				add_rule_key(rule, &rule->subsystem, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "ACTION") == 0) {
+		if (strcasecmp(key, "DRIVER") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid ACTION operation");
+				err("invalid DRIVER operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->action, operation, value);
+			add_rule_key(rule, &rule->driver, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "DEVPATH") == 0) {
+		if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("ATTR")-1);
+			if (attr == NULL) {
+				err("error parsing ATTR attribute\n");
+				goto invalid;
+			}
+			if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+				goto invalid;
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "KERNELS") == 0 ||
+		    strcasecmp(key, "ID") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid DEVPATH operation");
+				err("invalid KERNELS operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->devpath, operation, value);
+			add_rule_key(rule, &rule->kernels, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "BUS") == 0) {
+		if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
+		    strcasecmp(key, "BUS") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid BUS operation");
+				err("invalid SUBSYSTEMS operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->bus, operation, value);
+			add_rule_key(rule, &rule->subsystems, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "ID") == 0) {
+		if (strcasecmp(key, "DRIVERS") == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid ID operation");
+				err("invalid DRIVERS operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->id, operation, value);
+			add_rule_key(rule, &rule->drivers, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
+		if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+		    strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid SYSFS operation");
+				err("invalid ATTRS operation\n");
 				goto invalid;
 			}
-			attr = get_key_attribute(key + sizeof("SYSFS")-1);
+			attr = get_key_attribute(key + sizeof("ATTRS")-1);
 			if (attr == NULL) {
-				err("error parsing SYSFS attribute in '%s'", line);
-				continue;
+				err("error parsing ATTRS attribute\n");
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->sysfs, operation, attr, value);
+			if (strncmp(attr, "device/", 7) == 0)
+				err("the 'device' link is deprecated and will be removed from a future kernel, \n"
+				    "please fix it in %s:%u", filename, lineno);
+			else if (strstr(attr, "../") != NULL)
+				err("do not reference parent sysfs directories directly, that may break with a future kernel, \n"
+				    "please fix it in %s:%u", filename, lineno);
+			if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
-			add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+		if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("ENV")-1);
+			if (attr == NULL) {
+				err("error parsing ENV attribute\n");
+				goto invalid;
+			}
+			if (strncmp(attr, "PHYSDEV", 7) == 0)
+				physdev = 1;
+			if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
 
-		if (strncasecmp(key, "ENV", sizeof("ENV")-1) == 0) {
-			attr = get_key_attribute(key + sizeof("ENV")-1);
-			if (attr == NULL) {
-				err("error parsing ENV attribute");
-				continue;
-			}
-			add_rule_key_pair(rule, &rule->env, operation, attr, value);
+		if (strcasecmp(key, "PROGRAM") == 0) {
+			add_rule_key(rule, &rule->program, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "MODALIAS") == 0) {
-			add_rule_key(rule, &rule->modalias, operation, value);
+		if (strcasecmp(key, "RESULT") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid RESULT operation\n");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->result, operation, value);
 			valid = 1;
 			continue;
 		}
 
 		if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
 			attr = get_key_attribute(key + sizeof("IMPORT")-1);
-			if (attr && strstr(attr, "program")) {
-				dbg("IMPORT will be executed");
+			if (attr != NULL && strstr(attr, "program")) {
+				dbg("IMPORT will be executed\n");
 				rule->import_type  = IMPORT_PROGRAM;
-			} else if (attr && strstr(attr, "file")) {
-				dbg("IMPORT will be included as file");
+			} else if (attr != NULL && strstr(attr, "file")) {
+				dbg("IMPORT will be included as file\n");
 				rule->import_type  = IMPORT_FILE;
-			} else if (attr && strstr(attr, "parent")) {
-				dbg("IMPORT will include the parent values");
+			} else if (attr != NULL && strstr(attr, "parent")) {
+				dbg("IMPORT will include the parent values\n");
 				rule->import_type = IMPORT_PARENT;
 			} else {
 				/* figure it out if it is executable */
 				char file[PATH_SIZE];
 				char *pos;
-				struct stat stats;
+				struct stat statbuf;
 
 				strlcpy(file, value, sizeof(file));
 				pos = strchr(file, ' ');
@@ -411,12 +456,12 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 						pos[0] = '\0';
 				}
 
-				dbg("IMPORT auto mode for '%s'", file);
-				if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
-					dbg("IMPORT is executable, will be executed (autotype)");
+				dbg("IMPORT auto mode for '%s'\n", file);
+				if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
+					dbg("IMPORT is executable, will be executed (autotype)\n");
 					rule->import_type  = IMPORT_PROGRAM;
 				} else {
-					dbg("IMPORT is not executable, will be included as file (autotype)");
+					dbg("IMPORT is not executable, will be included as file (autotype)\n");
 					rule->import_type  = IMPORT_FILE;
 				}
 			}
@@ -425,30 +470,45 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVER") == 0) {
+		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
 			if (operation != KEY_OP_MATCH &&
 			    operation != KEY_OP_NOMATCH) {
-				err("invalid DRIVER operation");
+				err("invalid TEST operation\n");
 				goto invalid;
 			}
-			add_rule_key(rule, &rule->driver, operation, value);
+			attr = get_key_attribute(key + sizeof("TEST")-1);
+			if (attr != NULL)
+				rule->test_mode_mask = strtol(attr, NULL, 8);
+			add_rule_key(rule, &rule->test, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "RESULT") == 0) {
-			if (operation != KEY_OP_MATCH &&
-			    operation != KEY_OP_NOMATCH) {
-				err("invalid RESULT operation");
-				goto invalid;
+		if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+			attr = get_key_attribute(key + sizeof("RUN")-1);
+			if (attr != NULL) {
+				if (strstr(attr, "ignore_error"))
+					rule->run_ignore_error = 1;
 			}
-			add_rule_key(rule, &rule->result, operation, value);
+			add_rule_key(rule, &rule->run, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "PROGRAM") == 0) {
-			add_rule_key(rule, &rule->program, operation, value);
+		if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+			add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "LABEL") == 0) {
+			add_rule_key(rule, &rule->label, operation, value);
+			valid = 1;
+			continue;
+		}
+
+		if (strcasecmp(key, "GOTO") == 0) {
+			add_rule_key(rule, &rule->goto_label, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -457,22 +517,26 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			attr = get_key_attribute(key + sizeof("NAME")-1);
 			if (attr != NULL) {
 				if (strstr(attr, "all_partitions") != NULL) {
-					dbg("creation of partition nodes requested");
+					dbg("creation of partition nodes requested\n");
 					rule->partitions = DEFAULT_PARTITIONS_COUNT;
 				}
 				if (strstr(attr, "ignore_remove") != NULL) {
-					dbg("remove event should be ignored");
+					dbg("remove event should be ignored\n");
 					rule->ignore_remove = 1;
 				}
 			}
 			if (value[0] == '\0')
-				dbg("name empty, node creation supressed");
+				dbg("name empty, node creation supressed\n");
 			add_rule_key(rule, &rule->name, operation, value);
 			continue;
 		}
 
 		if (strcasecmp(key, "SYMLINK") == 0) {
-			add_rule_key(rule, &rule->symlink, operation, value);
+			if (operation == KEY_OP_MATCH ||
+			    operation == KEY_OP_NOMATCH)
+				add_rule_key(rule, &rule->symlink_match, operation, value);
+			else
+				add_rule_key(rule, &rule->symlink, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -485,7 +549,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 				if (endptr[0] != '\0') {
 					char owner[32];
 					uid_t uid = lookup_user(value);
-					dbg("replacing username='%s' by id=%i", value, uid);
+					dbg("replacing username='%s' by id=%i\n", value, uid);
 					sprintf(owner, "%u", (unsigned int) uid);
 					add_rule_key(rule, &rule->owner, operation, owner);
 					continue;
@@ -504,7 +568,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 				if (endptr[0] != '\0') {
 					char group[32];
 					gid_t gid = lookup_group(value);
-					dbg("replacing groupname='%s' by id=%i", value, gid);
+					dbg("replacing groupname='%s' by id=%i\n", value, gid);
 					sprintf(group, "%u", (unsigned int) gid);
 					add_rule_key(rule, &rule->group, operation, group);
 					continue;
@@ -516,42 +580,59 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strcasecmp(key, "MODE") == 0) {
-			rule->mode = strtol(value, NULL, 8);
-			rule->mode_operation = operation;
-			valid = 1;
-			continue;
-		}
-
-		if (strcasecmp(key, "RUN") == 0) {
-			add_rule_key(rule, &rule->run, operation, value);
+			add_rule_key(rule, &rule->mode, operation, value);
 			valid = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "OPTIONS") == 0) {
+			const char *pos;
+
 			if (strstr(value, "last_rule") != NULL) {
-				dbg("last rule to be applied");
+				dbg("last rule to be applied\n");
 				rule->last_rule = 1;
 			}
 			if (strstr(value, "ignore_device") != NULL) {
-				dbg("device should be ignored");
+				dbg("device should be ignored\n");
 				rule->ignore_device = 1;
 			}
 			if (strstr(value, "ignore_remove") != NULL) {
-				dbg("remove event should be ignored");
+				dbg("remove event should be ignored\n");
 				rule->ignore_remove = 1;
 			}
+			pos = strstr(value, "link_priority=");
+			if (pos != NULL) {
+				rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+				dbg("link priority=%i\n", rule->link_priority);
+			}
+			pos = strstr(value, "event_timeout=");
+			if (pos != NULL) {
+				rule->event_timeout = atoi(&pos[strlen("event_timeout=")]);
+				dbg("event timout=%i\n", rule->event_timeout);
+			}
+			pos = strstr(value, "string_escape=");
+			if (pos != NULL) {
+				pos = &pos[strlen("string_escape=")];
+				if (strncmp(pos, "none", strlen("none")) == 0)
+					rule->string_escape = ESCAPE_NONE;
+				else if (strncmp(pos, "replace", strlen("replace")) == 0)
+					rule->string_escape = ESCAPE_REPLACE;
+			}
 			if (strstr(value, "all_partitions") != NULL) {
-				dbg("creation of partition nodes requested");
+				dbg("creation of partition nodes requested\n");
 				rule->partitions = DEFAULT_PARTITIONS_COUNT;
 			}
 			valid = 1;
 			continue;
 		}
 
-		err("unknown key '%s'", key);
+		err("unknown key '%s' in %s:%u\n", key, filename, lineno);
 	}
 
+	if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
+		err("PHYSDEV* values are deprecated and will be removed from a future kernel, \n"
+		    "please fix it in %s:%u", filename, lineno);
+
 	/* skip line if not any valid key was found */
 	if (!valid)
 		goto invalid;
@@ -559,25 +640,23 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 	/* grow buffer and add rule */
 	rule_size = sizeof(struct udev_rule) + rule->bufsize;
 	padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
-	dbg("add %zi padding bytes", padding);
+	dbg("add %zi padding bytes\n", padding);
 	rule_size += padding;
 	rule->bufsize += padding;
 
 	rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
 	if (!rules->buf) {
-		err("realloc failed");
+		err("realloc failed\n");
 		goto exit;
 	}
-	dbg("adding rule to offset %zi", rules->bufsize);
+	dbg("adding rule to offset %zi\n", rules->bufsize);
 	memcpy(rules->buf + rules->bufsize, rule, rule_size);
 	rules->bufsize += rule_size;
 exit:
-	free(rule);
 	return 0;
 
 invalid:
-	free(rule);
-	err("invalid rule '%s:%u'", filename, lineno);
+	err("invalid rule '%s:%u'\n", filename, lineno);
 	return -1;
 }
 
@@ -593,10 +672,10 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 	int retval = 0;
 
 	if (file_map(filename, &buf, &bufsize) != 0) {
-		err("can't open '%s' as rules file: %s", filename, strerror(errno));
+		err("can't open '%s' as rules file: %s\n", filename, strerror(errno));
 		return -1;
 	}
-	dbg("reading '%s' as rules file", filename);
+	info("reading '%s' as rules file\n", filename);
 
 	/* loop through the whole file */
 	cur = 0;
@@ -609,11 +688,6 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			err("line too long, rule skipped '%s:%u'", filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -626,7 +700,12 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		if (bufline[0] == COMMENT_CHARACTER)
 			continue;
 
-		/* skip backslash and newline from multi line rules */
+		if (count >= sizeof(line)) {
+			err("line too long, rule skipped '%s:%u'\n", filename, lineno);
+			continue;
+		}
+
+		/* skip backslash and newline from multiline rules */
 		for (i = j = 0; i < count; i++) {
 			if (bufline[i] == '\\' && bufline[i+1] == '\n')
 				continue;
@@ -635,7 +714,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		}
 		line[j] = '\0';
 
-		dbg("read '%s'", line);
+		dbg("read '%s'\n", line);
 		add_to_rules(rules, line, filename, lineno);
 	}
 
@@ -645,37 +724,69 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 
 int udev_rules_init(struct udev_rules *rules, int resolve_names)
 {
-	struct stat stats;
-	int retval;
+	struct stat statbuf;
+	char filename[PATH_MAX];
+	LIST_HEAD(name_list);
+	LIST_HEAD(dyn_list);
+	struct name_entry *name_loop, *name_tmp;
+	struct name_entry *dyn_loop, *dyn_tmp;
+	int retval = 0;
 
 	memset(rules, 0x00, sizeof(struct udev_rules));
 	rules->resolve_names = resolve_names;
 
-	/* parse rules file or all matching files in directory */
-	if (stat(udev_rules_filename, &stats) != 0)
+	/* read main config from single file or all files in a directory */
+	if (stat(udev_rules_dir, &statbuf) != 0)
 		return -1;
-
-	if ((stats.st_mode & S_IFMT) != S_IFDIR) {
-		dbg("parse single rules file '%s'", udev_rules_filename);
-		retval = parse_file(rules, udev_rules_filename);
+	if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
+		dbg("parse single rules file '%s'\n", udev_rules_dir);
+		name_list_add(&name_list, udev_rules_dir, 1);
 	} else {
-		struct name_entry *name_loop, *name_tmp;
-		LIST_HEAD(name_list);
+		dbg("parse rules directory '%s'\n", udev_rules_dir);
+		retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
+	}
 
-		dbg("parse rules directory '%s'", udev_rules_filename);
-		retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+	/* read dynamic rules directory */
+	strlcpy(filename, udev_root, sizeof(filename));
+	strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+	if (stat(filename, &statbuf) != 0) {
+		create_path(filename);
+		selinux_setfscreatecon(filename, NULL, S_IFDIR|0755);
+		mkdir(filename, 0755);
+		selinux_resetfscreatecon();
+	}
+	add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
+
+	/* sort dynamic rules files by basename into list of files */
+	list_for_each_entry_safe(dyn_loop, dyn_tmp, &dyn_list, node) {
+		const char *dyn_base = strrchr(dyn_loop->name, '/');
+
+		if (dyn_base == NULL)
+			continue;
 
 		list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
-			if (stat(name_loop->name, &stats) == 0) {
-				if (stats.st_size)
-					parse_file(rules, name_loop->name);
-				else
-					dbg("empty rules file '%s'", name_loop->name);
-			} else
-				err("could not read '%s': %s", name_loop->name, strerror(errno));
-			list_del(&name_loop->node);
-			free(name_loop);
+			const char *name_base = strrchr(name_loop->name, '/');
+
+			if (name_base == NULL)
+				continue;
+
+			if (strcmp(name_base, dyn_base) > 0)
+				break;
 		}
+		list_move_tail(&dyn_loop->node, &name_loop->node);
+	}
+
+	/* parse list of files */
+	list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
+		if (stat(name_loop->name, &statbuf) == 0) {
+			if (statbuf.st_size)
+				parse_file(rules, name_loop->name);
+			else
+				dbg("empty rules file '%s'\n", name_loop->name);
+		} else
+			err("could not read '%s': %s\n", name_loop->name, strerror(errno));
+		list_del(&name_loop->node);
+		free(name_loop);
 	}
 
 	return retval;
@@ -688,3 +799,4 @@ void udev_rules_cleanup(struct udev_rules *rules)
 		rules->buf = NULL;
 	}
 }
+