X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=d527bf4bad4a51c8ee397d697124d6a0042217a7;hb=38895e573c6f17014393dc35a9e53d5f016172c3;hp=376006c7c4d4a6210d7047277dc45ef681dd8fc5;hpb=d2f605c8d61e4c5ef129f93510ab8b38e32cee97;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 376006c7c..d527bf4ba 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -235,7 +235,7 @@ static int add_rule_key_pair(struct udev_rule *rule, struct key_pairs *pairs,
 	return 0;
 }
 
-static int add_to_rules(struct udev_rules *rules, char *line)
+static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
 {
 	struct udev_rule *rule;
 	size_t rule_size;
@@ -263,67 +263,130 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 		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");
+				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");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->devpath, operation, value);
 			valid = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "KERNEL") == 0) {
-			add_rule_key(rule, &rule->kernel_name, operation, value);
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid KERNEL operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->kernel, operation, value);
 			valid = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "SUBSYSTEM") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid SUBSYSTEM operation");
+				goto invalid;
+			}
 			add_rule_key(rule, &rule->subsystem, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "ACTION") == 0) {
-			add_rule_key(rule, &rule->action, operation, value);
+		if (strcasecmp(key, "DRIVER") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DRIVER operation");
+				goto invalid;
+			}
+			err("DRIVER== will change in a future relase, "
+			    "please use DRIVERS== in %s:%u", filename, lineno);
+			/* FIXME: this should be rule->driver to match only the event device */
+			add_rule_key(rule, &rule->drivers, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "DEVPATH") == 0) {
-			add_rule_key(rule, &rule->devpath, operation, value);
+		if (strncasecmp(key, "ATTR", sizeof("ATTR")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid ATTR operation");
+				goto invalid;
+			}
+			attr = get_key_attribute(key + sizeof("ATTR")-1);
+			if (attr == NULL) {
+				err("error parsing ATTR attribute");
+				goto invalid;
+			}
+			if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "BUS") == 0) {
-			add_rule_key(rule, &rule->bus, operation, value);
+		if (strcasecmp(key, "KERNELS") == 0 ||
+		    strcasecmp(key, "ID") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid KERNELS operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->kernels, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "ID") == 0) {
-			add_rule_key(rule, &rule->id, operation, value);
+		if (strcasecmp(key, "SUBSYTEMS") == 0 ||
+		    strcasecmp(key, "BUS") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid SUBSYSTEMS operation");
+				goto invalid;
+			}
+			add_rule_key(rule, &rule->subsystems, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
-			attr = get_key_attribute(key + sizeof("SYSFS")-1);
-			if (attr == NULL) {
-				err("error parsing SYSFS attribute in '%s'", line);
-				continue;
+		if (strcasecmp(key, "DRIVERS") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DRIVERS operation");
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->sysfs, operation, attr, value);
+			add_rule_key(rule, &rule->drivers, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
-			add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+		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 ATTRSS operation");
+				goto invalid;
+			}
+			attr = get_key_attribute(key + sizeof("ATTRS")-1);
+			if (attr == NULL) {
+				err("error parsing ATTRS attribute");
+				goto invalid;
+			}
+			if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
@@ -332,15 +395,27 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			attr = get_key_attribute(key + sizeof("ENV")-1);
 			if (attr == NULL) {
 				err("error parsing ENV attribute");
-				continue;
+				goto invalid;
 			}
-			add_rule_key_pair(rule, &rule->env, operation, attr, value);
+			if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
+				goto invalid;
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "MODALIAS") == 0) {
-			add_rule_key(rule, &rule->modalias, operation, value);
+		if (strcasecmp(key, "PROGRAM") == 0) {
+			add_rule_key(rule, &rule->program, 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;
+			}
+			add_rule_key(rule, &rule->result, operation, value);
 			valid = 1;
 			continue;
 		}
@@ -390,20 +465,26 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVER") == 0) {
-			add_rule_key(rule, &rule->driver, operation, value);
+		if (strcasecmp(key, "RUN") == 0) {
+			add_rule_key(rule, &rule->run, operation, value);
 			valid = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "RESULT") == 0) {
-			add_rule_key(rule, &rule->result, 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, "PROGRAM") == 0) {
-			add_rule_key(rule, &rule->program, operation, value);
+		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;
 		}
@@ -421,7 +502,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 				}
 			}
 			if (value[0] == '\0')
-				dbg("name empty, not creation supressed");
+				dbg("name empty, node creation supressed");
 			add_rule_key(rule, &rule->name, operation, value);
 			continue;
 		}
@@ -477,12 +558,6 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			continue;
 		}
 
-		if (strcasecmp(key, "RUN") == 0) {
-			add_rule_key(rule, &rule->run, operation, value);
-			valid = 1;
-			continue;
-		}
-
 		if (strcasecmp(key, "OPTIONS") == 0) {
 			if (strstr(value, "last_rule") != NULL) {
 				dbg("last rule to be applied");
@@ -504,14 +579,12 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			continue;
 		}
 
-		err("unknown key '%s', in '%s'", key, line);
+		err("unknown key '%s' in %s:%u", key, filename, lineno);
 	}
 
 	/* skip line if not any valid key was found */
-	if (!valid) {
-		err("invalid rule '%s'", line);
-		goto exit;
-	}
+	if (!valid)
+		goto invalid;
 
 	/* grow buffer and add rule */
 	rule_size = sizeof(struct udev_rule) + rule->bufsize;
@@ -531,13 +604,18 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 exit:
 	free(rule);
 	return 0;
+
+invalid:
+	free(rule);
+	err("invalid rule '%s:%u'", filename, lineno);
+	return -1;
 }
 
 static int parse_file(struct udev_rules *rules, const char *filename)
 {
 	char line[LINE_SIZE];
 	char *bufline;
-	int lineno;
+	unsigned int lineno;
 	char *buf;
 	size_t bufsize;
 	size_t cur;
@@ -561,11 +639,6 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		cur += count+1;
 		lineno++;
 
-		if (count >= sizeof(line)) {
-			info("line too long, rule skipped %s, line %d", filename, lineno);
-			continue;
-		}
-
 		/* eat the whitespace */
 		while ((count > 0) && isspace(bufline[0])) {
 			bufline++;
@@ -578,7 +651,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'", 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;
@@ -588,7 +666,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		line[j] = '\0';
 
 		dbg("read '%s'", line);
-		add_to_rules(rules, line);
+		add_to_rules(rules, line, filename, lineno);
 	}
 
 	file_unmap(buf, bufsize);