X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules_parse.c;h=442ec65390cef3d71d1bf2247a0644c00f501808;hp=9041c383e0576c0874eb4c65c1486b118a53565a;hb=51f22c569636e16ae9801ea26f74b891259c1e72;hpb=271c2d7d26132858a3302208dfe1572aa9cbbd12

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 9041c383e..442ec6539 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -28,10 +28,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
 #include "udev_rules.h"
 
 
@@ -238,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;
@@ -279,36 +276,66 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 		}
 
 		if (strcasecmp(key, "KERNEL") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid KERNEL operation");
+				goto invalid;
+			}
 			add_rule_key(rule, &rule->kernel_name, 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) {
+			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, "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, "BUS") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid BUS operation");
+				goto invalid;
+			}
 			add_rule_key(rule, &rule->bus, operation, value);
 			valid = 1;
 			continue;
 		}
 
 		if (strcasecmp(key, "ID") == 0) {
+			if (operation != KEY_OP_MATCH &&
+			    operation != KEY_OP_NOMATCH) {
+				err("invalid ID operation");
+				goto invalid;
+			}
 			add_rule_key(rule, &rule->id, operation, value);
 			valid = 1;
 			continue;
@@ -369,6 +396,16 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 				pos = strchr(file, ' ');
 				if (pos)
 					pos[0] = '\0';
+
+				/* allow programs in /lib/udev called without the path */
+				if (strchr(file, '/') == NULL) {
+					strlcpy(file, "/lib/udev/", sizeof(file));
+					strlcat(file, value, sizeof(file));
+					pos = strchr(file, ' ');
+					if (pos)
+						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)");
@@ -414,7 +451,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;
 		}
@@ -497,14 +534,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'", key);
 	}
 
 	/* 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;
@@ -524,13 +559,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;
@@ -538,7 +578,7 @@ 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", filename);
+		err("can't open '%s' as rules file: %s", filename, strerror(errno));
 		return -1;
 	}
 	dbg("reading '%s' as rules file", filename);
@@ -555,7 +595,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
 		lineno++;
 
 		if (count >= sizeof(line)) {
-			info("line too long, rule skipped %s, line %d", filename, lineno);
+			err("line too long, rule skipped '%s:%u'", filename, lineno);
 			continue;
 		}
 
@@ -581,7 +621,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);
@@ -617,7 +657,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 				else
 					dbg("empty rules file '%s'", name_loop->name);
 			} else
-				dbg("could not read '%s'", name_loop->name);
+				err("could not read '%s': %s", name_loop->name, strerror(errno));
 			list_del(&name_loop->node);
 			free(name_loop);
 		}
@@ -626,7 +666,7 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
 	return retval;
 }
 
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
 {
 	if (rules->buf) {
 		free(rules->buf);