X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=bef5abab5e4dc5da9fc96faef2b1635b9758b680;hp=6d32e7301702bd19083b6f7db5a665c04c0514e5;hb=02bf3e13e00157c23f77a89a35cb3e51543d336e;hpb=3b529da42586aa430bb0d03800b19dd45552eae1

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 6d32e7301..bef5abab5 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -150,6 +150,7 @@ enum token_type {
 
 	TK_A_STRING_ESCAPE_NONE,
 	TK_A_STRING_ESCAPE_REPLACE,
+	TK_A_DB_PERSIST,
 	TK_A_INOTIFY_WATCH,		/* int */
 	TK_A_DEVLINK_PRIO,		/* int */
 	TK_A_OWNER,			/* val */
@@ -284,6 +285,7 @@ static const char *token_str(enum token_type type)
 
 		[TK_A_STRING_ESCAPE_NONE] =	"A STRING_ESCAPE_NONE",
 		[TK_A_STRING_ESCAPE_REPLACE] =	"A STRING_ESCAPE_REPLACE",
+		[TK_A_DB_PERSIST] =		"A DB_PERSIST",
 		[TK_A_INOTIFY_WATCH] = 		"A INOTIFY_WATCH",
 		[TK_A_DEVLINK_PRIO] =		"A DEVLINK_PRIO",
 		[TK_A_OWNER] =			"A OWNER",
@@ -370,6 +372,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
+	case TK_A_DB_PERSIST:
 		dbg(rules->udev, "%s\n", token_str(type));
 		break;
 	case TK_M_TEST:
@@ -751,12 +754,12 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 {
 	struct udev *udev = udev_device_get_udev(dev);
 	char **envp;
-	char result[4096];
+	char result[UTIL_LINE_SIZE];
 	size_t reslen;
 	char *line;
 
 	envp = udev_device_get_properties_envp(dev);
-	if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL, false) != 0)
+	if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0)
 		return -1;
 
 	line = result;
@@ -1045,6 +1048,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
+	case TK_A_DB_PERSIST:
 		break;
 	case TK_A_RUN:
 		token->key.value_off = add_string(rule_tmp->rules, value);
@@ -1572,6 +1576,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, op, NULL, &prio);
 				dbg(rules->udev, "link priority=%i\n", prio);
 			}
+
 			pos = strstr(value, "event_timeout=");
 			if (pos != NULL) {
 				int tout = atoi(&pos[strlen("event_timeout=")]);
@@ -1579,6 +1584,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, op, NULL, &tout);
 				dbg(rules->udev, "event timeout=%i\n", tout);
 			}
+
 			pos = strstr(value, "string_escape=");
 			if (pos != NULL) {
 				pos = &pos[strlen("string_escape=")];
@@ -1587,6 +1593,11 @@ static int add_rule(struct udev_rules *rules, char *line,
 				else if (strncmp(pos, "replace", strlen("replace")) == 0)
 					rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
 			}
+
+			pos = strstr(value, "db_persist=");
+			if (pos != NULL)
+				rule_add_key(&rule_tmp, TK_A_DB_PERSIST, op, NULL, NULL);
+
 			pos = strstr(value, "nowatch");
 			if (pos != NULL) {
 				const int off = 0;
@@ -1602,11 +1613,13 @@ static int add_rule(struct udev_rules *rules, char *line,
 					dbg(rules->udev, "inotify watch of device requested\n");
 				}
 			}
+
 			pos = strstr(value, "static_node=");
 			if (pos != NULL) {
 				rule_add_key(&rule_tmp, TK_A_STATIC_NODE, op, &pos[strlen("static_node=")], NULL);
 				rule_tmp.rule.rule.has_static_node = true;
 			}
+
 			continue;
 		}
 		err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
@@ -1751,23 +1764,27 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 	struct udev_list_entry *file_loop, *file_tmp;
 	struct token end_token;
 
-	rules = malloc(sizeof(struct udev_rules));
+	rules = calloc(1, sizeof(struct udev_rules));
 	if (rules == NULL)
 		return NULL;
-	memset(rules, 0x00, sizeof(struct udev_rules));
 	rules->udev = udev;
 	rules->resolve_names = resolve_names;
 	udev_list_init(&file_list);
 
 	/* init token array and string buffer */
 	rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token));
-	if (rules->tokens == NULL)
+	if (rules->tokens == NULL) {
+		free(rules);
 		return NULL;
+	}
 	rules->token_max = PREALLOC_TOKEN;
 
 	rules->buf = malloc(PREALLOC_STRBUF);
-	if (rules->buf == NULL)
+	if (rules->buf == NULL) {
+		free(rules->tokens);
+		free(rules);
 		return NULL;
+	}
 	rules->buf_max = PREALLOC_STRBUF;
 	/* offset 0 is always '\0' */
 	rules->buf[0] = '\0';
@@ -1776,8 +1793,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 	    rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
 
 	rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node));
-	if (rules->trie_nodes == NULL)
+	if (rules->trie_nodes == NULL) {
+		free(rules->buf);
+		free(rules->tokens);
+		free(rules);
 		return NULL;
+	}
 	rules->trie_nodes_max = PREALLOC_TRIE;
 	/* offset 0 is the trie root, with an empty string */
 	memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));
@@ -1795,7 +1816,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 		add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
 
 		/* read dynamic/temporary rules */
-		util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
+		util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
 		udev_list_init(&sort_list);
 		add_matching_files(udev, &sort_list, filename, ".rules");
 
@@ -2072,7 +2093,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 	can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) &&
 			(major(udev_device_get_devnum(event->dev)) > 0 ||
-			 strcmp(udev_device_get_subsystem(event->dev), "net") == 0));
+			 udev_device_get_ifindex(event->dev) > 0));
 
 	/* loop through token list, match, run actions or forward to next rule */
 	cur = &rules->tokens[0];
@@ -2276,7 +2297,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				     program,
 				     &rules->buf[rule->rule.filename_off],
 				     rule->rule.filename_line);
-				if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL, false) != 0) {
+				if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
 				} else {
@@ -2324,6 +2345,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				const char *key = &rules->buf[cur->key.value_off];
 				const char *value;
 
+				/* implicitely mark database as persistent across initramfs transition */
+				udev_device_set_db_persist(event->dev);
+
 				value = udev_device_get_property_value(event->dev_db, key);
 				if (value != NULL) {
 					struct udev_list_entry *entry;
@@ -2399,6 +2423,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		case TK_A_STRING_ESCAPE_REPLACE:
 			esc = ESCAPE_REPLACE;
 			break;
+		case TK_A_DB_PERSIST:
+			udev_device_set_db_persist(event->dev);
+			break;
 		case TK_A_INOTIFY_WATCH:
 			if (event->inotify_watch_final)
 				break;