X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=271de6f87968c4d8aa897e592248a9d6cf830944;hp=442ec65390cef3d71d1bf2247a0644c00f501808;hb=7d5ccc081008a08f066b5bb6805f417585ae663a;hpb=d59c84effdc50961bdbe01dcc41d71c8609e6700

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 442ec6539..271de6f87 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -342,6 +342,11 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid SYSFS operation");
+				goto invalid;
+			}
 			attr = get_key_attribute(key + sizeof("SYSFS")-1);
 			if (attr == NULL) {
 				err("error parsing SYSFS attribute in '%s'", line);
@@ -369,12 +374,6 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 			continue;
 		}
 
-		if (strcasecmp(key, "MODALIAS") == 0) {
-			add_rule_key(rule, &rule->modalias, 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")) {
@@ -421,12 +420,22 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
 		}
 
 		if (strcasecmp(key, "DRIVER") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid DRIVER operation");
+				goto invalid;
+			}
 			add_rule_key(rule, &rule->driver, 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;