From: Kay Sievers <kay.sievers@suse.de>
Date: Sun, 30 Apr 2006 23:45:26 +0000 (+0200)
Subject: add more warnings for invalid key operations
X-Git-Tag: 174~2271
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b1c4f377c4989e0d881778b5a61f0d08b05c0a24

add more warnings for invalid key operations
---

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 442ec6539..91cc9744f 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);
@@ -421,12 +426,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;