/*
- * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
- * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
+ * Copyright (C) 2003-2012 Kay Sievers <kay@vrfy.org>
*
* 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
#include <time.h>
#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;
};
};
-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 */
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;
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,
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_SECLABEL, /* val, attr */
TK_A_ENV, /* val, attr */
- TK_A_TAG, /* val */
TK_A_NAME, /* val */
TK_A_DEVLINK, /* val */
TK_A_ATTR, /* val, attr */
unsigned int value_off;
union {
unsigned int attr_off;
- int devlink_unique;
unsigned int rule_goto;
mode_t mode;
uid_t uid;
[TK_A_OWNER_ID] = "A OWNER_ID",
[TK_A_GROUP_ID] = "A GROUP_ID",
[TK_A_STATIC_NODE] = "A STATIC_NODE",
+ [TK_A_SECLABEL] = "A SECLABEL",
[TK_A_MODE_ID] = "A MODE_ID",
[TK_A_ENV] = "A ENV",
[TK_A_TAG] = "A ENV",
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) {
const char *tk_ptr = (char *)token;
unsigned int idx = (tk_ptr - tks_ptr) / sizeof(struct token);
- log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'\n",
+ log_debug("* RULE %s:%u, token: %u, count: %u, label: '%s'",
&rules->buf[token->rule.filename_off], token->rule.filename_line,
idx, token->rule.token_count,
&rules->buf[token->rule.label_off]);
case TK_A_MODE:
case TK_A_RUN_BUILTIN:
case TK_A_RUN_PROGRAM:
- log_debug("%s %s '%s'(%s)\n",
+ log_debug("%s %s '%s'(%s)",
token_str(type), operation_str(op), value, string_glob_str(glob));
break;
case TK_M_IMPORT_BUILTIN:
- log_debug("%s %i '%s'\n", token_str(type), token->key.builtin_cmd, value);
+ log_debug("%s %i '%s'", token_str(type), token->key.builtin_cmd, value);
break;
case TK_M_ATTR:
case TK_M_ATTRS:
case TK_M_ENV:
case TK_A_ATTR:
case TK_A_ENV:
- log_debug("%s %s '%s' '%s'(%s)\n",
+ log_debug("%s %s '%s' '%s'(%s)",
token_str(type), operation_str(op), attr, value, string_glob_str(glob));
break;
case TK_M_TAG:
case TK_A_TAG:
- log_debug("%s %s '%s'\n", token_str(type), operation_str(op), value);
+ log_debug("%s %s '%s'", token_str(type), operation_str(op), value);
break;
case TK_A_STRING_ESCAPE_NONE:
case TK_A_STRING_ESCAPE_REPLACE:
case TK_A_DB_PERSIST:
- log_debug("%s\n", token_str(type));
+ log_debug("%s", token_str(type));
break;
case TK_M_TEST:
- log_debug("%s %s '%s'(%s) %#o\n",
+ log_debug("%s %s '%s'(%s) %#o",
token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
break;
case TK_A_INOTIFY_WATCH:
- log_debug("%s %u\n", token_str(type), token->key.watch);
+ log_debug("%s %u", token_str(type), token->key.watch);
break;
case TK_A_DEVLINK_PRIO:
- log_debug("%s %u\n", token_str(type), token->key.devlink_prio);
+ log_debug("%s %u", token_str(type), token->key.devlink_prio);
break;
case TK_A_OWNER_ID:
- log_debug("%s %s %u\n", token_str(type), operation_str(op), token->key.uid);
+ log_debug("%s %s %u", token_str(type), operation_str(op), token->key.uid);
break;
case TK_A_GROUP_ID:
- log_debug("%s %s %u\n", token_str(type), operation_str(op), token->key.gid);
+ log_debug("%s %s %u", token_str(type), operation_str(op), token->key.gid);
break;
case TK_A_MODE_ID:
- log_debug("%s %s %#o\n", token_str(type), operation_str(op), token->key.mode);
+ log_debug("%s %s %#o", token_str(type), operation_str(op), token->key.mode);
break;
case TK_A_STATIC_NODE:
- log_debug("%s '%s'\n", token_str(type), value);
+ log_debug("%s '%s'", token_str(type), value);
+ break;
+ case TK_A_SECLABEL:
+ log_debug("%s %s '%s' '%s'", token_str(type), operation_str(op), attr, value);
break;
case TK_M_EVENT_TIMEOUT:
- log_debug("%s %u\n", token_str(type), token->key.event_timeout);
+ log_debug("%s %u", token_str(type), token->key.event_timeout);
break;
case TK_A_GOTO:
- log_debug("%s '%s' %u\n", token_str(type), value, token->key.rule_goto);
+ log_debug("%s '%s' %u", token_str(type), value, token->key.rule_goto);
break;
case TK_END:
- log_debug("* %s\n", token_str(type));
+ log_debug("* %s", token_str(type));
break;
case TK_M_PARENTS_MIN:
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_UNSET:
- log_debug("unknown type %u\n", type);
+ log_debug("unknown type %u", type);
break;
}
}
{
unsigned int i;
- log_debug("dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n",
+ log_debug("dumping %u (%zu bytes) tokens, %u (%zu bytes) strings",
rules->token_cur,
rules->token_cur * sizeof(struct token),
rules->buf_count,
rules->buf_cur);
- for(i = 0; i < rules->token_cur; i++)
+ for (i = 0; i < rules->token_cur; i++)
dump_token(rules, &rules->tokens[i]);
}
#else
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 */
/* 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;
}
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;
/* 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;
}
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;
char *key;
char *val;
size_t len;
+ struct udev_list_entry *entry;
/* find key */
key = line;
/* unquote */
if (val[0] == '"' || val[0] == '\'') {
if (val[len-1] != val[0]) {
- log_debug("inconsistent quoting: '%s', skip\n", line);
+ log_debug("inconsistent quoting: '%s', skip", line);
return -1;
}
val[len-1] = '\0';
val++;
}
- /* handle device, renamed by external tool, returning new path */
- if (streq(key, "DEVPATH")) {
- char syspath[UTIL_PATH_SIZE];
-
- log_debug("updating devpath from '%s' to '%s'\n",
- udev_device_get_devpath(dev), val);
- util_strscpyl(syspath, sizeof(syspath), "/sys", val, NULL);
- udev_device_set_syspath(dev, syspath);
- } else {
- struct udev_list_entry *entry;
-
- entry = udev_device_add_property(dev, key, val);
- /* store in db, skip private keys */
- if (key[0] != '.')
- udev_list_entry_set_num(entry, true);
- }
+ entry = udev_device_add_property(dev, key, val);
+ /* store in db, skip private keys */
+ if (key[0] != '.')
+ udev_list_entry_set_num(entry, true);
+
return 0;
}
FILE *f;
char line[UTIL_LINE_SIZE];
- f = fopen(filename, "r");
+ f = fopen(filename, "re");
if (f == NULL)
return -1;
while (fgets(line, sizeof(line), f) != NULL)
/* 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;
}
/* lookup file */
if (stat(file, &stats) == 0) {
- log_debug("file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
+ log_debug("file '%s' appeared after %i loops", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
return 0;
}
/* make sure, the device did not disappear in the meantime */
if (devicepath[0] != '\0' && stat(devicepath, &stats) != 0) {
- log_debug("device disappeared while waiting for '%s'\n", file);
+ log_debug("device disappeared while waiting for '%s'", file);
return -2;
}
- log_debug("wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
+ log_debug("wait for '%s' for %i mseconds", file, 1000 / WAIT_LOOP_PER_SECOND);
nanosleep(&duration, NULL);
}
- log_debug("waiting for '%s' failed\n", file);
+ log_debug("waiting for '%s' failed", file);
return -1;
}
const char *tail;
DIR *dir;
- util_strscpy(dirname, sizeof(dirname), attr);
+ strscpy(dirname, sizeof(dirname), attr);
pos = strstr(dirname, "/*/");
if (pos == NULL)
return -1;
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;
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
- log_error("missing closing brace for format\n");
+ log_error("missing closing brace for format");
return NULL;
}
pos[0] = '\0';
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:
case TK_M_ATTRS:
case TK_A_ATTR:
case TK_A_ENV:
+ case TK_A_SECLABEL:
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;
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:
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;
case TK_M_MAX:
case TK_END:
case TK_UNSET:
- log_error("wrong type %u\n", type);
+ log_error("wrong type %u", type);
return -1;
}
int has_glob;
has_split = (strchr(value, '|') != NULL);
- has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL || strchr(value, '[') != NULL);
+ has_glob = string_is_glob(value);
if (has_split && has_glob) {
glob = GL_SPLIT_GLOB;
} else if (has_split) {
token->key.op = op;
rule_tmp->token_cur++;
if (rule_tmp->token_cur >= ELEMENTSOF(rule_tmp->token)) {
- log_error("temporary rule array too small\n");
+ log_error("temporary rule array too small");
return -1;
}
return 0;
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) {
+ /* Avoid erroring on trailing whitespace. This is probably rare
+ * so save the work for the error case instead of always trying
+ * to strip the trailing whitespace with strstrip(). */
+ while (isblank(*linepos))
+ linepos++;
+
+ /* 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 %tu ('%s')\n",
+ filename, lineno, linepos - line + 1, tmp);
+ if (linepos[1] == '#')
+ log_error("hint: comments can only start at beginning of line");
+ }
break;
+ }
if (streq(key, "ACTION")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid ACTION operation\n");
+ log_error("invalid ACTION operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
if (streq(key, "DEVPATH")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid DEVPATH operation\n");
+ log_error("invalid DEVPATH operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
if (streq(key, "KERNEL")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid KERNEL operation\n");
+ log_error("invalid KERNEL operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
if (streq(key, "SUBSYSTEM")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid SUBSYSTEM operation\n");
+ log_error("invalid SUBSYSTEM operation");
goto invalid;
}
/* bus, class, subsystem events should all be the same */
streq(value, "bus") ||
streq(value, "class")) {
if (streq(value, "bus") || streq(value, "class"))
- log_error("'%s' must be specified as 'subsystem' \n"
+ log_error("'%s' must be specified as 'subsystem' "
"please fix it in %s:%u", value, filename, lineno);
rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
} else
if (streq(key, "DRIVER")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid DRIVER operation\n");
+ log_error("invalid DRIVER operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
if (startswith(key, "ATTR{")) {
attr = get_key_attribute(rules->udev, key + sizeof("ATTR")-1);
if (attr == NULL) {
- log_error("error parsing ATTR attribute\n");
+ log_error("error parsing ATTR attribute");
goto invalid;
}
if (op < OP_MATCH_MAX) {
continue;
}
+ if (startswith(key, "SECLABEL{")) {
+ attr = get_key_attribute(rules->udev, key + sizeof("SECLABEL")-1);
+ if (!attr) {
+ log_error("error parsing SECLABEL attribute");
+ goto invalid;
+ }
+
+ rule_add_key(&rule_tmp, TK_A_SECLABEL, op, value, attr);
+ continue;
+ }
+
if (streq(key, "KERNELS")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid KERNELS operation\n");
+ log_error("invalid KERNELS operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
if (streq(key, "SUBSYSTEMS")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid SUBSYSTEMS operation\n");
+ log_error("invalid SUBSYSTEMS operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
if (streq(key, "DRIVERS")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid DRIVERS operation\n");
+ log_error("invalid DRIVERS operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
if (startswith(key, "ATTRS{")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid ATTRS operation\n");
+ log_error("invalid ATTRS operation");
goto invalid;
}
attr = get_key_attribute(rules->udev, key + sizeof("ATTRS")-1);
if (attr == NULL) {
- log_error("error parsing ATTRS attribute\n");
+ log_error("error parsing ATTRS attribute");
goto invalid;
}
if (startswith(attr, "device/"))
if (streq(key, "TAGS")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid TAGS operation\n");
+ log_error("invalid TAGS operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_TAGS, op, value, NULL);
if (startswith(key, "ENV{")) {
attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1);
if (attr == NULL) {
- log_error("error parsing ENV attribute\n");
+ log_error("error parsing ENV attribute");
goto invalid;
}
if (op < OP_MATCH_MAX) {
for (i = 0; i < ELEMENTSOF(blacklist); i++) {
if (!streq(attr, blacklist[i]))
continue;
- log_error("invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno);
+ log_error("invalid ENV attribute, '%s' can not be set %s:%u", attr, filename, lineno);
goto invalid;
}
if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
if (streq(key, "RESULT")) {
if (op > OP_MATCH_MAX) {
- log_error("invalid RESULT operation\n");
+ log_error("invalid RESULT operation");
goto invalid;
}
rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
if (startswith(key, "IMPORT")) {
attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
if (attr == NULL) {
- log_error("IMPORT{} type missing, ignoring IMPORT %s:%u\n", filename, lineno);
+ log_error("IMPORT{} type missing, ignoring IMPORT %s:%u", filename, lineno);
continue;
}
if (streq(attr, "program")) {
cmd = udev_builtin_lookup(value);
if (cmd < UDEV_BUILTIN_MAX) {
- log_debug("IMPORT found builtin '%s', replacing %s:%u\n",
+ log_debug("IMPORT found builtin '%s', replacing %s:%u",
value, filename, lineno);
rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
continue;
if (cmd < UDEV_BUILTIN_MAX)
rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
else
- log_error("IMPORT{builtin}: '%s' unknown %s:%u\n", value, filename, lineno);
+ log_error("IMPORT{builtin}: '%s' unknown %s:%u", value, filename, lineno);
} else if (streq(attr, "file")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
} else if (streq(attr, "db")) {
} else if (streq(attr, "parent")) {
rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
} else
- log_error("IMPORT{} unknown type, ignoring IMPORT %s:%u\n", filename, lineno);
+ log_error("IMPORT{} unknown type, ignoring IMPORT %s:%u", filename, lineno);
continue;
}
mode_t mode = 0;
if (op > OP_MATCH_MAX) {
- log_error("invalid TEST operation\n");
+ log_error("invalid TEST operation");
goto invalid;
}
attr = get_key_attribute(rules->udev, key + sizeof("TEST")-1);
if (cmd < UDEV_BUILTIN_MAX)
rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
else
- log_error("IMPORT{builtin}: '%s' unknown %s:%u\n", value, filename, lineno);
+ log_error("IMPORT{builtin}: '%s' unknown %s:%u", value, filename, lineno);
} else if (streq(attr, "program")) {
enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
} else {
- log_error("RUN{} unknown type, ignoring RUN %s:%u\n", filename, lineno);
+ log_error("RUN{} unknown type, ignoring RUN %s:%u", filename, lineno);
}
continue;
}
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;
}
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;
}
continue;
}
- log_error("unknown key '%s' in %s:%u\n", key, filename, lineno);
+ log_error("unknown key '%s' in %s:%u", key, filename, lineno);
goto invalid;
}
return 0;
invalid:
- log_error("invalid rule '%s:%u'\n", filename, lineno);
+ log_error("invalid rule '%s:%u'", filename, lineno);
return -1;
}
unsigned int i;
if (null_or_empty_path(filename)) {
- log_debug("skip empty file: %s\n", filename);
+ log_debug("skip empty file: %s", filename);
return 0;
}
- log_debug("read rules file: %s\n", filename);
+ log_debug("read rules file: %s", filename);
- f = fopen(filename, "r");
+ f = fopen(filename, "re");
if (f == NULL)
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;
}
if (len+1 >= sizeof(line)) {
- log_error("line too long '%s':%u, ignored\n", filename, line_nr);
+ log_error("line too long '%s':%u, ignored", filename, line_nr);
continue;
}
add_rule(rules, key, filename, filename_off, line_nr);
/* 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++) {
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;
}
if (rules->tokens[i].key.rule_goto == 0)
- log_error("GOTO '%s' has no matching label in: '%s'\n", label, filename);
+ log_error("GOTO '%s' has no matching label in: '%s'", label, filename);
}
}
return 0;
/* init token array and string buffer */
rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token));
- if (rules->tokens == NULL) {
- free(rules);
- return NULL;
- }
+ if (rules->tokens == NULL)
+ return udev_rules_unref(rules);
rules->token_max = PREALLOC_TOKEN;
- rules->buf = malloc(PREALLOC_STRBUF);
- 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';
- rules->buf_cur = 1;
-
- rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node));
- 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));
- rules->trie_nodes_cur = 1;
-
- rules->dirs = strv_new(TEST_PREFIX SYSCONFDIR "/udev/rules.d",
- TEST_PREFIX "/run/udev/rules.d",
- TEST_PREFIX UDEVLIBEXECDIR "/rules.d",
+ rules->strbuf = strbuf_new();
+ if (!rules->strbuf)
+ return udev_rules_unref(rules);
+
+ rules->dirs = strv_new("/etc/udev/rules.d",
+ "/run/udev/rules.d",
+ UDEVLIBEXECDIR "/rules.d",
NULL);
if (!rules->dirs) {
log_error("failed to build config directory array");
- return NULL;
+ return udev_rules_unref(rules);
}
- if (!strv_path_canonicalize(rules->dirs)) {
- log_error("failed to canonicalize config directories\n");
- return NULL;
+ if (!path_strv_canonicalize(rules->dirs)) {
+ log_error("failed to canonicalize config directories");
+ return udev_rules_unref(rules);
}
strv_uniq(rules->dirs);
- r = conf_files_list_strv(&files, ".rules", (const char **)rules->dirs);
+
+ udev_rules_check_timestamp(rules);
+
+ 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 NULL;
+ log_error("failed to enumerate rules files: %s", strerror(-r));
+ return udev_rules_unref(rules);
}
- rules->dirs_ts_usec = calloc(strv_length(rules->dirs), sizeof(long long));
/*
* The offset value in the rules strct is limited; add all
* 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);
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",
+ 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",
+ 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);
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);
- free(rules->dirs_ts_usec);
free(rules);
return NULL;
}
bool udev_rules_check_timestamp(struct udev_rules *rules)
{
- unsigned int i;
- bool changed = false;
-
- for (i = 0; rules->dirs[i]; i++) {
- struct stat stats;
-
- if (stat(rules->dirs[i], &stats) < 0)
- continue;
-
- if (rules->dirs_ts_usec[i] == ts_usec(&stats.st_mtim))
- continue;
-
- /* first check */
- if (rules->dirs_ts_usec[i] != 0) {
- log_debug("reload - timestamp of '%s' changed\n", rules->dirs[i]);
- changed = true;
- }
+ if (!rules)
+ return false;
- /* update timestamp */
- rules->dirs_ts_usec[i] = ts_usec(&stats.st_mtim);
- }
-
- return changed;
+ return paths_check_timestamp(rules->dirs, &rules->dirs_ts_usec, true);
}
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;
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;
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 {
{
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, '|');
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));
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]))
udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(event->dev)) {
const char *devlink;
- devlink = udev_list_entry_get_name(list_entry) + strlen(TEST_PREFIX "/dev/");
+ devlink = udev_list_entry_get_name(list_entry) + strlen("/dev/");
if (match_key(rules, cur, devlink) == 0) {
match = true;
break;
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);
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;
}
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;
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;
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);
}
}
break;
}
case TK_M_EVENT_TIMEOUT:
- log_debug("OPTIONS event_timeout=%u\n", cur->key.event_timeout);
+ log_debug("OPTIONS event_timeout=%u", cur->key.event_timeout);
event->timeout_usec = cur->key.event_timeout * 1000 * 1000;
break;
case TK_M_PROGRAM: {
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",
+ log_debug("PROGRAM '%s' %s:%u",
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) {
if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
count = util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT);
if (count > 0)
- log_debug("%i character(s) replaced\n" , count);
+ log_debug("%i character(s) replaced" , count);
}
event->program_result = strdup(result);
if (cur->key.op == OP_NOMATCH)
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;
case TK_M_IMPORT_PROG: {
char import[UTIL_PATH_SIZE];
- udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
- log_debug("IMPORT '%s' %s:%u\n",
+ udev_event_apply_format(event, rules_str(rules, cur->key.value_off), import, sizeof(import));
+ log_debug("IMPORT '%s' %s:%u",
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)
if (udev_builtin_run_once(cur->key.builtin_cmd)) {
/* check if we ran already */
if (event->builtin_run & (1 << cur->key.builtin_cmd)) {
- log_debug("IMPORT builtin skip '%s' %s:%u\n",
+ log_debug("IMPORT builtin skip '%s' %s:%u",
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))
event->builtin_run |= (1 << cur->key.builtin_cmd);
}
- udev_event_apply_format(event, &rules->buf[cur->key.value_off], command, sizeof(command));
- log_debug("IMPORT builtin '%s' %s:%u\n",
+ udev_event_apply_format(event, rules_str(rules, cur->key.value_off), command, sizeof(command));
+ log_debug("IMPORT builtin '%s' %s:%u",
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) {
/* remember failure */
- log_debug("IMPORT builtin '%s' returned non-zero\n",
+ log_debug("IMPORT builtin '%s' returned non-zero",
udev_builtin_name(cur->key.builtin_cmd));
event->builtin_ret |= (1 << cur->key.builtin_cmd);
if (cur->key.op != OP_NOMATCH)
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);
FILE *f;
bool imported = false;
- f = fopen("/proc/cmdline", "r");
+ f = fopen("/proc/cmdline", "re");
if (f != NULL) {
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);
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;
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",
+ log_debug("OWNER %u %s:%u",
event->uid,
- &rules->buf[rule->rule.filename_off],
+ rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
break;
}
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",
+ log_debug("GROUP %u %s:%u",
event->gid,
- &rules->buf[rule->rule.filename_off],
+ rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
break;
}
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);
+ log_error("ignoring invalid mode '%s'", mode_str);
break;
}
if (cur->key.op == OP_ASSIGN_FINAL)
event->mode_final = true;
event->mode_set = true;
event->mode = mode;
- log_debug("MODE %#o %s:%u\n",
+ log_debug("MODE %#o %s:%u",
event->mode,
- &rules->buf[rule->rule.filename_off],
+ rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
break;
}
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",
+ log_debug("OWNER %u %s:%u",
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:
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",
+ log_debug("GROUP %u %s:%u",
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:
event->mode_final = true;
event->mode_set = true;
event->mode = cur->key.mode;
- log_debug("MODE %#o %s:%u\n",
+ log_debug("MODE %#o %s:%u",
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];
+ case TK_A_SECLABEL: {
+ const char *name, *label;
- if (value[0] != '\0') {
- char temp_value[UTIL_NAME_SIZE];
- struct udev_list_entry *entry;
+ name = rules_str(rules, cur->key.attr_off);
+ label = rules_str(rules, cur->key.value_off);
+ if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
+ udev_list_cleanup(&event->seclabel_list);
+ udev_list_entry_add(&event->seclabel_list, name, label);
+ log_debug("SECLABEL{%s}='%s' %s:%u",
+ name, label,
+ rules_str(rules, rule->rule.filename_off),
+ rule->rule.filename_line);
+ break;
+ }
+ case TK_A_ENV: {
+ 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++) {
(*p >= '0' && *p <= '9') ||
*p == '-' || *p == '_')
continue;
- log_error("ignoring invalid tag name '%s'\n", tag);
+ log_error("ignoring invalid tag name '%s'", tag);
break;
}
udev_device_add_tag(event->dev, tag);
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;
if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
count = util_replace_chars(name_str, "/");
if (count > 0)
- log_debug("%i character(s) replaced\n", count);
+ log_debug("%i character(s) replaced", count);
}
if (major(udev_device_get_devnum(event->dev)) &&
- (!streq(name_str, udev_device_get_devnode(event->dev) + strlen(TEST_PREFIX "/dev/")))) {
+ (!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",
+ log_debug("NAME '%s' %s:%u",
event->name,
- &rules->buf[rule->rule.filename_off],
+ rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
break;
}
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)
count = util_replace_chars(temp, "/");
if (count > 0)
- log_debug("%i character(s) replaced\n" , count);
+ log_debug("%i character(s) replaced" , count);
pos = temp;
while (isspace(pos[0]))
pos++;
next = strchr(pos, ' ');
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), TEST_PREFIX "/dev/", pos, NULL);
- udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
+ log_debug("LINK '%s' %s:%u", pos,
+ 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];
next = strchr(pos, ' ');
}
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), TEST_PREFIX "/dev/", pos, NULL);
- udev_device_add_devlink(event->dev, filename, cur->key.devlink_unique);
+ log_debug("LINK '%s' %s:%u", pos,
+ 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));
- log_debug("ATTR '%s' writing '%s' %s:%u\n", attr, value,
- &rules->buf[rule->rule.filename_off],
+ udev_event_apply_format(event, rules_str(rules, cur->key.value_off), value, sizeof(value));
+ log_debug("ATTR '%s' writing '%s' %s:%u", attr, value,
+ rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
- f = fopen(attr, "w");
+ f = fopen(attr, "we");
if (f != NULL) {
if (fprintf(f, "%s", value) <= 0)
- log_error("error writing ATTR{%s}: %m\n", attr);
+ log_error("error writing ATTR{%s}: %m", attr);
fclose(f);
} else {
- log_error("error opening ATTR{%s} for writing: %m\n", attr);
+ log_error("error opening ATTR{%s} for writing: %m", attr);
}
break;
}
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],
+ log_debug("RUN '%s' %s:%u",
+ 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;
}
case TK_M_PARENTS_MAX:
case TK_M_MAX:
case TK_UNSET:
- log_error("wrong type %u\n", cur->type);
+ log_error("wrong type %u", cur->type);
goto nomatch;
}
}
}
-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;
uid = 0;
gid = 0;
mode = 0;
+ strv_free(tags);
+ tags = NULL;
break;
case TK_A_OWNER_ID:
uid = cur->key.uid;
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), TEST_PREFIX "/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", 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: %m", tag_symlink, device_node);
+ 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;
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", device_node, mode);
+ return -errno;
+ } else
+ log_debug("chmod '%s' %#o", 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 ", device_node, uid, gid);
+ return -errno;
+ } else
+ log_debug("chown '%s' %u %u", 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++;
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;
}
~ianmdlvl / elogind.git / blobdiff