X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-rules.c;h=16348126ee6e88140cec2b48709c8614954cbfa6;hp=0900928d0bd1cdf73242200d4c75f1c4a3d064b9;hb=1291bc895b3dc52fbf7f4c3a04507c14428c4152;hpb=0820a4f0f6d6c264339a501a4352c22af26c5300 diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 0900928d0..16348126e 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1,6 +1,5 @@ /* - * Copyright (C) 2003-2012 Kay Sievers - * Copyright (C) 2008 Alan Jenkins + * Copyright (C) 2003-2012 Kay Sievers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,10 +32,11 @@ #include "udev.h" #include "path-util.h" #include "conf-files.h" +#include "strbuf.h" +#include "strv.h" +#include "util.h" #define PREALLOC_TOKEN 2048 -#define PREALLOC_STRBUF 32 * 1024 -#define PREALLOC_TRIE 256 struct uid_gid { unsigned int name_off; @@ -46,22 +46,10 @@ struct uid_gid { }; }; -struct trie_node { - /* this node's first child */ - unsigned int child_idx; - /* the next child of our parent node's child list */ - unsigned int next_child_idx; - /* this node's last child (shortcut for append) */ - unsigned int last_child_idx; - unsigned int value_off; - unsigned short value_len; - unsigned char key; -}; - struct udev_rules { struct udev *udev; char **dirs; - unsigned long long *dirs_ts_usec; + usec_t *dirs_ts_usec; int resolve_names; /* every key in the rules file becomes a token */ @@ -69,16 +57,8 @@ struct udev_rules { unsigned int token_cur; unsigned int token_max; - /* all key strings are copied to a single string buffer */ - char *buf; - size_t buf_cur; - size_t buf_max; - unsigned int buf_count; - - /* during rule parsing, strings are indexed and de-duplicated */ - struct trie_node *trie_nodes; - unsigned int trie_nodes_cur; - unsigned int trie_nodes_max; + /* all key strings are copied and de-duplicated in a single continuous string buffer */ + struct strbuf *strbuf; /* during rule parsing, uid/gid lookup results are cached */ struct uid_gid *uids; @@ -89,6 +69,14 @@ struct udev_rules { unsigned int gids_max; }; +static char *rules_str(struct udev_rules *rules, unsigned int off) { + return rules->strbuf->buf + off; +} + +static unsigned int rules_add_string(struct udev_rules *rules, const char *s) { + return strbuf_add_string(rules->strbuf, s, strlen(s)); +} + /* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */ enum operation_type { OP_UNSET, @@ -166,9 +154,9 @@ enum token_type { TK_A_OWNER_ID, /* uid_t */ TK_A_GROUP_ID, /* gid_t */ TK_A_MODE_ID, /* mode_t */ + TK_A_TAG, /* val */ TK_A_STATIC_NODE, /* val */ TK_A_ENV, /* val, attr */ - TK_A_TAG, /* val */ TK_A_NAME, /* val */ TK_A_DEVLINK, /* val */ TK_A_ATTR, /* val, attr */ @@ -202,7 +190,6 @@ struct token { unsigned int value_off; union { unsigned int attr_off; - int devlink_unique; unsigned int rule_goto; mode_t mode; uid_t uid; @@ -325,7 +312,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) enum token_type type = token->type; enum operation_type op = token->key.op; enum string_glob_type glob = token->key.glob; - const char *value = &rules->buf[token->key.value_off]; + const char *value = str(rules, token->key.value_off); const char *attr = &rules->buf[token->key.attr_off]; switch (type) { @@ -449,118 +436,6 @@ static inline void dump_token(struct udev_rules *rules, struct token *token) {} static inline void dump_rules(struct udev_rules *rules) {} #endif /* DEBUG */ -static int add_new_string(struct udev_rules *rules, const char *str, size_t bytes) -{ - int off; - - /* grow buffer if needed */ - if (rules->buf_cur + bytes+1 >= rules->buf_max) { - char *buf; - unsigned int add; - - /* double the buffer size */ - add = rules->buf_max; - if (add < bytes * 8) - add = bytes * 8; - - buf = realloc(rules->buf, rules->buf_max + add); - if (buf == NULL) - return -1; - rules->buf = buf; - rules->buf_max += add; - } - off = rules->buf_cur; - memcpy(&rules->buf[rules->buf_cur], str, bytes); - rules->buf_cur += bytes; - rules->buf_count++; - return off; -} - -static int add_string(struct udev_rules *rules, const char *str) -{ - unsigned int node_idx; - struct trie_node *new_node; - unsigned int new_node_idx; - unsigned char key; - unsigned short len; - unsigned int depth; - unsigned int off; - struct trie_node *parent; - - /* walk trie, start from last character of str to find matching tails */ - len = strlen(str); - key = str[len-1]; - node_idx = 0; - for (depth = 0; depth <= len; depth++) { - struct trie_node *node; - unsigned int child_idx; - - node = &rules->trie_nodes[node_idx]; - off = node->value_off + node->value_len - len; - - /* match against current node */ - if (depth == len || (node->value_len >= len && memcmp(&rules->buf[off], str, len) == 0)) - return off; - - /* lookup child node */ - key = str[len - 1 - depth]; - child_idx = node->child_idx; - while (child_idx > 0) { - struct trie_node *child; - - child = &rules->trie_nodes[child_idx]; - if (child->key == key) - break; - child_idx = child->next_child_idx; - } - if (child_idx == 0) - break; - node_idx = child_idx; - } - - /* string not found, add it */ - off = add_new_string(rules, str, len + 1); - - /* grow trie nodes if needed */ - if (rules->trie_nodes_cur >= rules->trie_nodes_max) { - struct trie_node *nodes; - unsigned int add; - - /* double the buffer size */ - add = rules->trie_nodes_max; - if (add < 8) - add = 8; - - nodes = realloc(rules->trie_nodes, (rules->trie_nodes_max + add) * sizeof(struct trie_node)); - if (nodes == NULL) - return -1; - rules->trie_nodes = nodes; - rules->trie_nodes_max += add; - } - - /* get a new node */ - new_node_idx = rules->trie_nodes_cur; - rules->trie_nodes_cur++; - new_node = &rules->trie_nodes[new_node_idx]; - memset(new_node, 0x00, sizeof(struct trie_node)); - new_node->value_off = off; - new_node->value_len = len; - new_node->key = key; - - /* join the parent's child list */ - parent = &rules->trie_nodes[node_idx]; - if (parent->child_idx == 0) { - parent->child_idx = new_node_idx; - } else { - struct trie_node *last_child; - - last_child = &rules->trie_nodes[parent->last_child_idx]; - last_child->next_child_idx = new_node_idx; - } - parent->last_child_idx = new_node_idx; - return off; -} - static int add_token(struct udev_rules *rules, struct token *token) { /* grow buffer if needed */ @@ -593,7 +468,7 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner) /* lookup, if we know it already */ for (i = 0; i < rules->uids_cur; i++) { off = rules->uids[i].name_off; - if (streq(&rules->buf[off], owner)) { + if (streq(rules_str(rules, off), owner)) { uid = rules->uids[i].uid; return uid; } @@ -617,7 +492,7 @@ static uid_t add_uid(struct udev_rules *rules, const char *owner) rules->uids_max += add; } rules->uids[rules->uids_cur].uid = uid; - off = add_string(rules, owner); + off = rules_add_string(rules, owner); if (off <= 0) return uid; rules->uids[rules->uids_cur].name_off = off; @@ -634,7 +509,7 @@ static gid_t add_gid(struct udev_rules *rules, const char *group) /* lookup, if we know it already */ for (i = 0; i < rules->gids_cur; i++) { off = rules->gids[i].name_off; - if (streq(&rules->buf[off], group)) { + if (streq(rules_str(rules, off), group)) { gid = rules->gids[i].gid; return gid; } @@ -658,7 +533,7 @@ static gid_t add_gid(struct udev_rules *rules, const char *group) rules->gids_max += add; } rules->gids[rules->gids_cur].gid = gid; - off = add_string(rules, group); + off = rules_add_string(rules, group); if (off <= 0) return gid; rules->gids[rules->gids_cur].name_off = off; @@ -727,7 +602,7 @@ static int import_property_from_string(struct udev_device *dev, char *line) log_debug("updating devpath from '%s' to '%s'\n", udev_device_get_devpath(dev), val); - util_strscpyl(syspath, sizeof(syspath), "/sys", val, NULL); + strscpyl(syspath, sizeof(syspath), "/sys", val, NULL); udev_device_set_syspath(dev, syspath); } else { struct udev_list_entry *entry; @@ -818,8 +693,8 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout) /* a relative path is a device attribute */ devicepath[0] = '\0'; if (file[0] != '/') { - util_strscpyl(devicepath, sizeof(devicepath), udev_device_get_syspath(dev), NULL); - util_strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL); + strscpyl(devicepath, sizeof(devicepath), udev_device_get_syspath(dev), NULL); + strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL); file = filepath; } @@ -853,7 +728,7 @@ static int attr_subst_subdir(char *attr, size_t len) const char *tail; DIR *dir; - util_strscpy(dirname, sizeof(dirname), attr); + strscpy(dirname, sizeof(dirname), attr); pos = strstr(dirname, "/*/"); if (pos == NULL) return -1; @@ -868,7 +743,7 @@ static int attr_subst_subdir(char *attr, size_t len) if (dent->d_name[0] == '.') continue; - util_strscpyl(attr, len, dirname, "/", dent->d_name, tail, NULL); + strscpyl(attr, len, dirname, "/", dent->d_name, tail, NULL); if (stat(attr, &stats) == 0) { found = true; break; @@ -1020,14 +895,15 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_A_OWNER: case TK_A_GROUP: case TK_A_MODE: + case TK_A_DEVLINK: case TK_A_NAME: case TK_A_GOTO: case TK_M_TAG: case TK_A_TAG: - token->key.value_off = add_string(rule_tmp->rules, value); + token->key.value_off = rules_add_string(rule_tmp->rules, value); break; case TK_M_IMPORT_BUILTIN: - token->key.value_off = add_string(rule_tmp->rules, value); + token->key.value_off = rules_add_string(rule_tmp->rules, value); token->key.builtin_cmd = *(enum udev_builtin_cmd *)data; break; case TK_M_ENV: @@ -1036,15 +912,11 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_A_ATTR: case TK_A_ENV: attr = data; - token->key.value_off = add_string(rule_tmp->rules, value); - token->key.attr_off = add_string(rule_tmp->rules, attr); - break; - case TK_A_DEVLINK: - token->key.value_off = add_string(rule_tmp->rules, value); - token->key.devlink_unique = *(int *)data; + token->key.value_off = rules_add_string(rule_tmp->rules, value); + token->key.attr_off = rules_add_string(rule_tmp->rules, attr); break; case TK_M_TEST: - token->key.value_off = add_string(rule_tmp->rules, value); + token->key.value_off = rules_add_string(rule_tmp->rules, value); if (data != NULL) token->key.mode = *(mode_t *)data; break; @@ -1055,7 +927,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_A_RUN_BUILTIN: case TK_A_RUN_PROGRAM: token->key.builtin_cmd = *(enum udev_builtin_cmd *)data; - token->key.value_off = add_string(rule_tmp->rules, value); + token->key.value_off = rules_add_string(rule_tmp->rules, value); break; case TK_A_INOTIFY_WATCH: case TK_A_DEVLINK_PRIO: @@ -1071,7 +943,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, token->key.mode = *(mode_t *)data; break; case TK_A_STATIC_NODE: - token->key.value_off = add_string(rule_tmp->rules, value); + token->key.value_off = rules_add_string(rule_tmp->rules, value); break; case TK_M_EVENT_TIMEOUT: token->key.event_timeout = *(int *)data; @@ -1195,8 +1067,22 @@ static int add_rule(struct udev_rules *rules, char *line, char *value; enum operation_type op; - if (get_key(rules->udev, &linepos, &key, &op, &value) != 0) + if (get_key(rules->udev, &linepos, &key, &op, &value) != 0) { + /* If we aren't at the end of the line, this is a parsing error. + * Make a best effort to describe where the problem is. */ + if (*linepos != '\n') { + char buf[2] = {linepos[1]}; + _cleanup_free_ char *tmp; + + tmp = cescape(buf); + log_error("invalid key/value pair in file %s on line %u," + "starting at character %lu ('%s')\n", + filename, lineno, linepos - line + 1, tmp); + if (linepos[1] == '#') + log_info("hint: comments can only start at beginning of line"); + } break; + } if (streq(key, "ACTION")) { if (op > OP_MATCH_MAX) { @@ -1467,7 +1353,7 @@ static int add_rule(struct udev_rules *rules, char *line, } if (streq(key, "LABEL")) { - rule_tmp.rule.rule.label_off = add_string(rules, value); + rule_tmp.rule.rule.label_off = rules_add_string(rules, value); continue; } @@ -1496,17 +1382,11 @@ static int add_rule(struct udev_rules *rules, char *line, continue; } - if (startswith(key, "SYMLINK")) { - if (op < OP_MATCH_MAX) { + if (streq(key, "SYMLINK")) { + if (op < OP_MATCH_MAX) rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL); - } else { - int flag = 0; - - attr = get_key_attribute(rules->udev, key + sizeof("SYMLINK")-1); - if (attr != NULL && strstr(attr, "unique") != NULL) - flag = 1; - rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, &flag); - } + else + rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL); rule_tmp.rule.rule.can_set_name = true; continue; } @@ -1650,7 +1530,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) return -1; first_token = rules->token_cur; - filename_off = add_string(rules, filename); + filename_off = rules_add_string(rules, filename); while (fgets(line, sizeof(line), f) != NULL) { char *key; @@ -1691,7 +1571,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) /* link GOTOs to LABEL rules in this file to be able to fast-forward */ for (i = first_token+1; i < rules->token_cur; i++) { if (rules->tokens[i].type == TK_A_GOTO) { - char *label = &rules->buf[rules->tokens[i].key.value_off]; + char *label = rules_str(rules, rules->tokens[i].key.value_off); unsigned int j; for (j = i+1; j < rules->token_cur; j++) { @@ -1699,7 +1579,7 @@ static int parse_file(struct udev_rules *rules, const char *filename) continue; if (rules->tokens[j].rule.label_off == 0) continue; - if (!streq(label, &rules->buf[rules->tokens[j].rule.label_off])) + if (!streq(label, rules_str(rules, rules->tokens[j].rule.label_off))) continue; rules->tokens[i].key.rule_goto = j; break; @@ -1730,28 +1610,13 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token)); if (rules->tokens == NULL) return udev_rules_unref(rules); - rules->token_max = PREALLOC_TOKEN; - rules->buf = malloc(PREALLOC_STRBUF); - if (rules->buf == NULL) + rules->strbuf = strbuf_new(); + if (!rules->strbuf) return udev_rules_unref(rules); - rules->buf_max = PREALLOC_STRBUF; - /* offset 0 is always '\0' */ - rules->buf[0] = '\0'; - rules->buf_cur = 1; - - rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node)); - if (rules->trie_nodes == NULL) - return udev_rules_unref(rules); - - 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)); - rules->trie_nodes_cur = 1; - - rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d", + rules->dirs = strv_new("/etc/udev/rules.d", "/run/udev/rules.d", UDEVLIBEXECDIR "/rules.d", NULL); @@ -1765,12 +1630,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) } strv_uniq(rules->dirs); - rules->dirs_ts_usec = calloc(strv_length(rules->dirs), sizeof(long long)); + rules->dirs_ts_usec = calloc(strv_length(rules->dirs), sizeof(usec_t)); if(!rules->dirs_ts_usec) return udev_rules_unref(rules); udev_rules_check_timestamp(rules); - r = conf_files_list_strv(&files, ".rules", (const char **)rules->dirs); + r = conf_files_list_strv(&files, ".rules", NULL, (const char **)rules->dirs); if (r < 0) { log_error("failed to enumerate rules files: %s\n", strerror(-r)); return udev_rules_unref(rules); @@ -1781,7 +1646,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) * rules file names to the beginning of the string buffer. */ STRV_FOREACH(f, files) - add_string(rules, *f); + rules_add_string(rules, *f); STRV_FOREACH(f, files) parse_file(rules, *f); @@ -1791,37 +1656,14 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) memset(&end_token, 0x00, sizeof(struct token)); end_token.type = TK_END; add_token(rules, &end_token); + log_debug("rules contain %zu bytes tokens (%u * %zu bytes), %zu bytes strings\n", + rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->strbuf->len); - /* shrink allocated token and string buffer */ - if (rules->token_cur < rules->token_max) { - struct token *tokens; - - tokens = realloc(rules->tokens, rules->token_cur * sizeof(struct token)); - if (tokens != NULL || rules->token_cur == 0) { - rules->tokens = tokens; - rules->token_max = rules->token_cur; - } - } - if (rules->buf_cur < rules->buf_max) { - char *buf; - - buf = realloc(rules->buf, rules->buf_cur); - if (buf != NULL || rules->buf_cur == 0) { - rules->buf = buf; - rules->buf_max = rules->buf_cur; - } - } - log_debug("rules use %zu bytes tokens (%u * %zu bytes), %zu bytes buffer\n", - rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max); - log_debug("temporary index used %zu bytes (%u * %zu bytes)\n", - rules->trie_nodes_cur * sizeof(struct trie_node), - rules->trie_nodes_cur, sizeof(struct trie_node)); - - /* cleanup trie */ - free(rules->trie_nodes); - rules->trie_nodes = NULL; - rules->trie_nodes_cur = 0; - rules->trie_nodes_max = 0; + /* cleanup temporary strbuf data */ + log_debug("%zu strings (%zu bytes), %zu de-duplicated (%zu bytes), %zu trie nodes used\n", + rules->strbuf->in_count, rules->strbuf->in_len, + rules->strbuf->dedup_count, rules->strbuf->dedup_len, rules->strbuf->nodes_count); + strbuf_complete(rules->strbuf); /* cleanup uid/gid cache */ free(rules->uids); @@ -1842,8 +1684,7 @@ struct udev_rules *udev_rules_unref(struct udev_rules *rules) if (rules == NULL) return NULL; free(rules->tokens); - free(rules->buf); - free(rules->trie_nodes); + strbuf_cleanup(rules->strbuf); free(rules->uids); free(rules->gids); strv_free(rules->dirs); @@ -1866,7 +1707,7 @@ bool udev_rules_check_timestamp(struct udev_rules *rules) if (stat(rules->dirs[i], &stats) < 0) continue; - if (rules->dirs_ts_usec[i] == ts_usec(&stats.st_mtim)) + if (rules->dirs_ts_usec[i] == timespec_load(&stats.st_mtim)) continue; /* first check */ @@ -1876,7 +1717,7 @@ bool udev_rules_check_timestamp(struct udev_rules *rules) } /* update timestamp */ - rules->dirs_ts_usec[i] = ts_usec(&stats.st_mtim); + rules->dirs_ts_usec[i] = timespec_load(&stats.st_mtim); } out: return changed; @@ -1884,7 +1725,7 @@ out: static int match_key(struct udev_rules *rules, struct token *token, const char *val) { - char *key_value = &rules->buf[token->key.value_off]; + char *key_value = rules_str(rules, token->key.value_off); char *pos; bool match = false; @@ -1903,7 +1744,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char * const char *s; size_t len; - s = &rules->buf[token->key.value_off]; + s = rules_str(rules, token->key.value_off); len = strlen(val); for (;;) { const char *next; @@ -1912,7 +1753,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char * if (next != NULL) { size_t matchlen = (size_t)(next - s); - match = (matchlen == len && strncmp(s, val, matchlen) == 0); + match = (matchlen == len && strneq(s, val, matchlen)); if (match) break; } else { @@ -1927,7 +1768,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char * { char value[UTIL_PATH_SIZE]; - util_strscpy(value, sizeof(value), &rules->buf[token->key.value_off]); + strscpy(value, sizeof(value), rules_str(rules, token->key.value_off)); key_value = value; while (key_value != NULL) { pos = strchr(key_value, '|'); @@ -1964,7 +1805,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct char vbuf[UTIL_NAME_SIZE]; size_t len; - name = &rules->buf[cur->key.attr_off]; + name = rules_str(rules, cur->key.attr_off); switch (cur->key.attrsubst) { case SB_FORMAT: udev_event_apply_format(event, name, nbuf, sizeof(nbuf)); @@ -1990,11 +1831,11 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct const char *key_value; size_t klen; - key_value = &rules->buf[cur->key.value_off]; + key_value = rules_str(rules, cur->key.value_off); klen = strlen(key_value); if (klen > 0 && !isspace(key_value[klen-1])) { if (value != vbuf) { - util_strscpy(vbuf, sizeof(vbuf), value); + strscpy(vbuf, sizeof(vbuf), value); value = vbuf; } while (len > 0 && isspace(vbuf[--len])) @@ -2073,7 +1914,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event goto nomatch; break; case TK_M_ENV: { - const char *key_name = &rules->buf[cur->key.attr_off]; + const char *key_name = rules_str(rules, cur->key.attr_off); const char *value; value = udev_device_get_property_value(event->dev, key_name); @@ -2088,7 +1929,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event bool match = false; udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) { - if (streq(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry))) { + if (streq(rules_str(rules, cur->key.value_off), udev_list_entry_get_name(list_entry))) { match = true; break; } @@ -2109,7 +1950,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event char filename[UTIL_PATH_SIZE]; int found; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), filename, sizeof(filename)); found = (wait_for_file(event->dev, filename, 10) == 0); if (!found && (cur->key.op != OP_NOMATCH)) goto nomatch; @@ -2157,7 +1998,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event goto try_parent; break; case TK_M_TAGS: { - bool match = udev_device_has_tag(event->dev_parent, &rules->buf[cur->key.value_off]); + bool match = udev_device_has_tag(event->dev_parent, rules_str(rules, cur->key.value_off)); if (match && key->key.op == OP_NOMATCH) goto try_parent; @@ -2185,13 +2026,13 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event struct stat statbuf; int match; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), filename, sizeof(filename)); if (util_resolve_subsys_kernel(event->udev, filename, filename, sizeof(filename), 0) != 0) { if (filename[0] != '/') { char tmp[UTIL_PATH_SIZE]; - util_strscpy(tmp, sizeof(tmp), filename); - util_strscpyl(filename, sizeof(filename), + strscpy(tmp, sizeof(tmp), filename); + strscpyl(filename, sizeof(filename), udev_device_get_syspath(event->dev), "/", tmp, NULL); } } @@ -2217,11 +2058,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event free(event->program_result); event->program_result = NULL; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], program, sizeof(program)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), program, sizeof(program)); envp = udev_device_get_properties_envp(event->dev); log_debug("PROGRAM '%s' %s:%u\n", program, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); if (udev_event_spawn(event, program, envp, sigmask, result, sizeof(result)) < 0) { @@ -2245,7 +2086,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event case TK_M_IMPORT_FILE: { char import[UTIL_PATH_SIZE]; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), import, sizeof(import)); if (import_file_into_properties(event->dev, import) != 0) if (cur->key.op != OP_NOMATCH) goto nomatch; @@ -2254,10 +2095,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event case TK_M_IMPORT_PROG: { char import[UTIL_PATH_SIZE]; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), import, sizeof(import)); log_debug("IMPORT '%s' %s:%u\n", import, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); if (import_program_into_properties(event, import, sigmask) != 0) @@ -2273,7 +2114,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->builtin_run & (1 << cur->key.builtin_cmd)) { log_debug("IMPORT builtin skip '%s' %s:%u\n", udev_builtin_name(cur->key.builtin_cmd), - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); /* return the result from earlier run */ if (event->builtin_ret & (1 << cur->key.builtin_cmd)) @@ -2285,10 +2126,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event event->builtin_run |= (1 << cur->key.builtin_cmd); } - udev_event_apply_format(event, &rules->buf[cur->key.value_off], command, sizeof(command)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), command, sizeof(command)); log_debug("IMPORT builtin '%s' %s:%u\n", udev_builtin_name(cur->key.builtin_cmd), - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); if (udev_builtin_run(event->dev, cur->key.builtin_cmd, command, false) != 0) { @@ -2302,7 +2143,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; } case TK_M_IMPORT_DB: { - const char *key = &rules->buf[cur->key.value_off]; + const char *key = rules_str(rules, cur->key.value_off); const char *value; value = udev_device_get_property_value(event->dev_db, key); @@ -2326,7 +2167,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event char cmdline[4096]; if (fgets(cmdline, sizeof(cmdline), f) != NULL) { - const char *key = &rules->buf[cur->key.value_off]; + const char *key = rules_str(rules, cur->key.value_off); char *pos; pos = strstr(cmdline, key); @@ -2362,7 +2203,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event case TK_M_IMPORT_PARENT: { char import[UTIL_PATH_SIZE]; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), import, sizeof(import)); if (import_parent_into_properties(event->dev, import) != 0) if (cur->key.op != OP_NOMATCH) goto nomatch; @@ -2398,11 +2239,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = true; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], owner, sizeof(owner)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), owner, sizeof(owner)); + event->owner_set = true; event->uid = util_lookup_user(event->udev, owner); log_debug("OWNER %u %s:%u\n", event->uid, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } @@ -2413,11 +2255,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = true; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], group, sizeof(group)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), group, sizeof(group)); + event->group_set = true; event->gid = util_lookup_group(event->udev, group); log_debug("GROUP %u %s:%u\n", event->gid, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } @@ -2428,7 +2271,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->mode_final) break; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode_str, sizeof(mode_str)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), mode_str, sizeof(mode_str)); mode = strtol(mode_str, &endptr, 8); if (endptr[0] != '\0') { log_error("ignoring invalid mode '%s'\n", mode_str); @@ -2440,7 +2283,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event event->mode = mode; log_debug("MODE %#o %s:%u\n", event->mode, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } @@ -2449,10 +2292,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = true; + event->owner_set = true; event->uid = cur->key.uid; log_debug("OWNER %u %s:%u\n", event->uid, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; case TK_A_GROUP_ID: @@ -2460,10 +2304,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = true; + event->group_set = true; event->gid = cur->key.gid; log_debug("GROUP %u %s:%u\n", event->gid, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; case TK_A_MODE_ID: @@ -2475,32 +2320,45 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event event->mode = cur->key.mode; log_debug("MODE %#o %s:%u\n", event->mode, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; case TK_A_ENV: { - const char *name = &rules->buf[cur->key.attr_off]; - char *value = &rules->buf[cur->key.value_off]; - - if (value[0] != '\0') { - char temp_value[UTIL_NAME_SIZE]; - struct udev_list_entry *entry; + const char *name = rules_str(rules, cur->key.attr_off); + char *value = rules_str(rules, cur->key.value_off); + char value_new[UTIL_NAME_SIZE]; + const char *value_old = NULL; + struct udev_list_entry *entry; - udev_event_apply_format(event, value, temp_value, sizeof(temp_value)); - entry = udev_device_add_property(event->dev, name, temp_value); - /* store in db, skip private keys */ - if (name[0] != '.') - udev_list_entry_set_num(entry, true); - } else { + if (value[0] == '\0') { + if (cur->key.op == OP_ADD) + break; udev_device_add_property(event->dev, name, NULL); + break; } + + if (cur->key.op == OP_ADD) + value_old = udev_device_get_property_value(event->dev, name); + if (value_old) { + char temp[UTIL_NAME_SIZE]; + + /* append value separated by space */ + udev_event_apply_format(event, value, temp, sizeof(temp)); + strscpyl(value_new, sizeof(value_new), value_old, " ", temp, NULL); + } else + udev_event_apply_format(event, value, value_new, sizeof(value_new)); + + entry = udev_device_add_property(event->dev, name, value_new); + /* store in db, skip private keys */ + if (name[0] != '.') + udev_list_entry_set_num(entry, true); break; } case TK_A_TAG: { char tag[UTIL_PATH_SIZE]; const char *p; - udev_event_apply_format(event, &rules->buf[cur->key.value_off], tag, sizeof(tag)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), tag, sizeof(tag)); if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_device_cleanup_tags_list(event->dev); for (p = tag; *p != '\0'; p++) { @@ -2516,7 +2374,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event break; } case TK_A_NAME: { - const char *name = &rules->buf[cur->key.value_off]; + const char *name = rules_str(rules, cur->key.value_off); char name_str[UTIL_PATH_SIZE]; int count; @@ -2535,14 +2393,14 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event (!streq(name_str, udev_device_get_devnode(event->dev) + strlen("/dev/")))) { log_error("NAME=\"%s\" ignored, kernel device nodes " "can not be renamed; please fix it in %s:%u\n", name, - &rules->buf[rule->rule.filename_off], rule->rule.filename_line); + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } free(event->name); event->name = strdup(name_str); log_debug("NAME '%s' %s:%u\n", event->name, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); break; } @@ -2562,7 +2420,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event udev_device_cleanup_devlinks_list(event->dev); /* allow multiple symlinks separated by spaces */ - udev_event_apply_format(event, &rules->buf[cur->key.value_off], temp, sizeof(temp)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), temp, sizeof(temp)); if (esc == ESCAPE_UNSET) count = util_replace_chars(temp, "/ "); else if (esc == ESCAPE_REPLACE) @@ -2576,9 +2434,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event while (next != NULL) { next[0] = '\0'; log_debug("LINK '%s' %s:%u\n", pos, - &rules->buf[rule->rule.filename_off], rule->rule.filename_line); - util_strscpyl(filename, sizeof(filename), "/dev/", pos, NULL); - udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique); + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); + strscpyl(filename, sizeof(filename), "/dev/", pos, NULL); + udev_device_add_devlink(event->dev, filename); while (isspace(next[1])) next++; pos = &next[1]; @@ -2586,25 +2444,25 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event } if (pos[0] != '\0') { log_debug("LINK '%s' %s:%u\n", pos, - &rules->buf[rule->rule.filename_off], rule->rule.filename_line); - util_strscpyl(filename, sizeof(filename), "/dev/", pos, NULL); - udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique); + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); + strscpyl(filename, sizeof(filename), "/dev/", pos, NULL); + udev_device_add_devlink(event->dev, filename); } break; } case TK_A_ATTR: { - const char *key_name = &rules->buf[cur->key.attr_off]; + const char *key_name = rules_str(rules, cur->key.attr_off); char attr[UTIL_PATH_SIZE]; char value[UTIL_NAME_SIZE]; FILE *f; if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0) - util_strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL); + strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL); attr_subst_subdir(attr, sizeof(attr)); - udev_event_apply_format(event, &rules->buf[cur->key.value_off], value, sizeof(value)); + udev_event_apply_format(event, rules_str(rules, cur->key.value_off), value, sizeof(value)); log_debug("ATTR '%s' writing '%s' %s:%u\n", attr, value, - &rules->buf[rule->rule.filename_off], + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); f = fopen(attr, "we"); if (f != NULL) { @@ -2623,10 +2481,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_list_cleanup(&event->run_list); log_debug("RUN '%s' %s:%u\n", - &rules->buf[cur->key.value_off], - &rules->buf[rule->rule.filename_off], + rules_str(rules, cur->key.value_off), + rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); - entry = udev_list_entry_add(&event->run_list, &rules->buf[cur->key.value_off], NULL); + entry = udev_list_entry_add(&event->run_list, rules_str(rules, cur->key.value_off), NULL); udev_list_entry_set_num(entry, cur->key.builtin_cmd); break; } @@ -2654,16 +2512,21 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event } } -void udev_rules_apply_static_dev_perms(struct udev_rules *rules) +int udev_rules_apply_static_dev_perms(struct udev_rules *rules) { struct token *cur; struct token *rule; uid_t uid = 0; gid_t gid = 0; mode_t mode = 0; + _cleanup_strv_free_ char **tags = NULL; + char **t; + FILE *f = NULL; + _cleanup_free_ char *path = NULL; + int r = 0; if (rules->tokens == NULL) - return; + return 0; cur = &rules->tokens[0]; rule = cur; @@ -2680,6 +2543,8 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) uid = 0; gid = 0; mode = 0; + strv_free(tags); + tags = NULL; break; case TK_A_OWNER_ID: uid = cur->key.uid; @@ -2689,20 +2554,57 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) break; case TK_A_MODE_ID: mode = cur->key.mode; + break; + case TK_A_TAG: + r = strv_extend(&tags, rules_str(rules, cur->key.value_off)); + if (r < 0) + goto finish; + break; case TK_A_STATIC_NODE: { - char filename[UTIL_PATH_SIZE]; + char device_node[UTIL_PATH_SIZE]; + char tags_dir[UTIL_PATH_SIZE]; + char tag_symlink[UTIL_PATH_SIZE]; struct stat stats; /* we assure, that the permissions tokens are sorted before the static token */ - if (mode == 0 && uid == 0 && gid == 0) + if (mode == 0 && uid == 0 && gid == 0 && tags == NULL) goto next; - util_strscpyl(filename, sizeof(filename), "/dev/", - &rules->buf[cur->key.value_off], NULL); - if (stat(filename, &stats) != 0) + strscpyl(device_node, sizeof(device_node), "/dev/", rules_str(rules, cur->key.value_off), NULL); + if (stat(device_node, &stats) != 0) goto next; if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) goto next; + + if (tags) { + /* Export the tags to a directory as symlinks, allowing otherwise dead nodes to be tagged */ + + STRV_FOREACH(t, tags) { + _cleanup_free_ char *unescaped_filename = NULL; + + strscpyl(tags_dir, sizeof(tags_dir), "/run/udev/static_node-tags/", *t, "/", NULL); + r = mkdir_p(tags_dir, 0755); + if (r < 0) { + log_error("failed to create %s: %s\n", tags_dir, strerror(-r)); + return r; + } + + unescaped_filename = xescape(rules_str(rules, cur->key.value_off), "/."); + + strscpyl(tag_symlink, sizeof(tag_symlink), tags_dir, unescaped_filename, NULL); + r = symlink(device_node, tag_symlink); + if (r < 0 && errno != EEXIST) { + log_error("failed to create symlink %s -> %s: %s\n", tag_symlink, device_node, strerror(errno)); + return -errno; + } else + r = 0; + } + } + + /* don't touch the permissions if only the tags were set */ + if (mode == 0 && uid == 0 && gid == 0) + goto next; + if (mode == 0) { if (gid > 0) mode = 0660; @@ -2710,20 +2612,28 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) mode = 0600; } if (mode != (stats.st_mode & 01777)) { - chmod(filename, mode); - log_debug("chmod '%s' %#o\n", filename, mode); + r = chmod(device_node, mode); + if (r < 0) { + log_error("failed to chmod '%s' %#o\n", device_node, mode); + return -errno; + } else + log_debug("chmod '%s' %#o\n", device_node, mode); } if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) { - chown(filename, uid, gid); - log_debug("chown '%s' %u %u\n", filename, uid, gid); + r = chown(device_node, uid, gid); + if (r < 0) { + log_error("failed to chown '%s' %u %u \n", device_node, uid, gid); + return -errno; + } else + log_debug("chown '%s' %u %u\n", device_node, uid, gid); } - utimensat(AT_FDCWD, filename, NULL, 0); + utimensat(AT_FDCWD, device_node, NULL, 0); break; } case TK_END: - return; + goto finish; } cur++; @@ -2733,4 +2643,18 @@ next: cur = rule + rule->rule.token_count; continue; } + +finish: + if (f) { + fflush(f); + fchmod(fileno(f), 0644); + if (ferror(f) || rename(path, "/run/udev/static_node-tags") < 0) { + r = -errno; + unlink("/run/udev/static_node-tags"); + unlink(path); + } + fclose(f); + } + + return r; }