X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=c718ff04eb88f3e7d7d1b3db346b01ba90d99dbf;hp=19ee06d3798c996a50ce2ae6b3ce6b0e9ff329c0;hb=78230c0dbedbb9273bf2abde8c48db1e8be952f8;hpb=b99028c96307e729303be8f6750418979a7488b9 diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 19ee06d37..c718ff04e 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -31,28 +31,66 @@ #define PREALLOC_TOKEN 2048 #define PREALLOC_STRBUF 32 * 1024 -enum key_operation { - KEY_OP_UNSET, - KEY_OP_MATCH, - KEY_OP_NOMATCH, - KEY_OP_ADD, - KEY_OP_ASSIGN, - KEY_OP_ASSIGN_FINAL, +struct uid_gid { + unsigned int name_off; + union { + uid_t uid; + gid_t gid; + }; }; -static const char *operation_str[] = { - [KEY_OP_MATCH] = "match", - [KEY_OP_NOMATCH] = "nomatch", - [KEY_OP_ADD] = "add", - [KEY_OP_ASSIGN] = "assign", - [KEY_OP_ASSIGN_FINAL] = "assign-final", +/* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */ +struct udev_rules { + struct udev *udev; + int resolve_names; + + /* every key in the rules file becomes a token */ + struct token *tokens; + 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, we cache uid/gid lookup results */ + struct uid_gid *uids; + unsigned int uids_cur; + unsigned int uids_max; + struct uid_gid *gids; + unsigned int gids_cur; + unsigned int gids_max; }; +enum operation_type { + OP_UNSET, + + OP_MATCH, + OP_NOMATCH, + OP_MATCH_MAX, + + OP_ADD, + OP_ASSIGN, + OP_ASSIGN_FINAL, +}; + +enum string_glob_type { + GL_UNSET, + GL_PLAIN, /* no special chars */ + GL_GLOB, /* shell globs ?,*,[] */ + GL_SPLIT, /* multi-value A|B */ + GL_SPLIT_GLOB, /* multi-value with glob A*|B* */ + GL_SOMETHING, /* commonly used "?*" */ + GL_FORMAT, +}; + +/* tokens of a rule are sorted/handled in this order */ enum token_type { - TK_UNDEF, + TK_UNSET, TK_RULE, - TK_M_WAITFOR, /* val */ TK_M_ACTION, /* val */ TK_M_DEVPATH, /* val */ TK_M_KERNEL, /* val */ @@ -61,13 +99,15 @@ enum token_type { TK_M_ENV, /* val, attr */ TK_M_SUBSYSTEM, /* val */ TK_M_DRIVER, /* val */ + TK_M_WAITFOR, /* val */ TK_M_ATTR, /* val, attr */ + TK_M_PARENTS_MIN, TK_M_KERNELS, /* val */ TK_M_SUBSYSTEMS, /* val */ TK_M_DRIVERS, /* val */ TK_M_ATTRS, /* val, attr */ - TK_PARENTS_MAX, + TK_M_PARENTS_MAX, TK_M_TEST, /* val, mode_t */ TK_M_PROGRAM, /* val */ @@ -75,6 +115,7 @@ enum token_type { TK_M_IMPORT_PROG, /* val */ TK_M_IMPORT_PARENT, /* val */ TK_M_RESULT, /* val */ + TK_M_MAX, TK_A_IGNORE_DEVICE, TK_A_STRING_ESCAPE_NONE, @@ -100,11 +141,74 @@ enum token_type { TK_END, }; +/* we try to pack stuff in a way that we take only 12 bytes per token */ +struct token { + union { + unsigned char type; /* same as in rule and key */ + struct { + unsigned char type; + unsigned char flags; + unsigned short token_count; + unsigned int label_off; + unsigned short filename_off; + unsigned short filename_line; + } rule; + struct { + unsigned char type; + unsigned char flags; + unsigned char op; + unsigned char glob; + unsigned int value_off; + union { + unsigned int attr_off; + int ignore_error; + int i; + unsigned int rule_goto; + mode_t mode; + uid_t uid; + gid_t gid; + int num_fake_part; + int devlink_prio; + int event_timeout; + }; + } key; + }; +}; + +#define MAX_TK 64 +struct rule_tmp { + struct udev_rules *rules; + struct token rule; + struct token token[MAX_TK]; + unsigned int token_cur; +}; + +#ifdef DEBUG +static const char *operation_str[] = { + [OP_UNSET] = "UNSET", + [OP_MATCH] = "match", + [OP_NOMATCH] = "nomatch", + [OP_MATCH_MAX] = "MATCH_MAX", + + [OP_ADD] = "add", + [OP_ASSIGN] = "assign", + [OP_ASSIGN_FINAL] = "assign-final", +}; + +static const char *string_glob_str[] = { + [GL_UNSET] = "UNSET", + [GL_PLAIN] = "plain", + [GL_GLOB] = "glob", + [GL_SPLIT] = "split", + [GL_SPLIT_GLOB] = "split-glob", + [GL_SOMETHING] = "split-glob", + [GL_FORMAT] = "format", +}; + static const char *token_str[] = { - [TK_UNDEF] = "UNDEF", + [TK_UNSET] = "UNSET", [TK_RULE] = "RULE", - [TK_M_WAITFOR] = "M WAITFOR", [TK_M_ACTION] = "M ACTION", [TK_M_DEVPATH] = "M DEVPATH", [TK_M_KERNEL] = "M KERNEL", @@ -113,13 +217,15 @@ static const char *token_str[] = { [TK_M_ENV] = "M ENV", [TK_M_SUBSYSTEM] = "M SUBSYSTEM", [TK_M_DRIVER] = "M DRIVER", + [TK_M_WAITFOR] = "M WAITFOR", [TK_M_ATTR] = "M ATTR", + [TK_M_PARENTS_MIN] = "M PARENTS_MIN", [TK_M_KERNELS] = "M KERNELS", [TK_M_SUBSYSTEMS] = "M SUBSYSTEMS", [TK_M_DRIVERS] = "M DRIVERS", [TK_M_ATTRS] = "M ATTRS", - [TK_PARENTS_MAX] = "PARENTS_MAX", + [TK_M_PARENTS_MAX] = "M PARENTS_MAX", [TK_M_TEST] = "M TEST", [TK_M_PROGRAM] = "M PROGRAM", @@ -127,6 +233,7 @@ static const char *token_str[] = { [TK_M_IMPORT_PROG] = "M IMPORT_PROG", [TK_M_IMPORT_PARENT] = "M MPORT_PARENT", [TK_M_RESULT] = "M RESULT", + [TK_M_MAX] = "M MAX", [TK_A_IGNORE_DEVICE] = "A IGNORE_DEVICE", [TK_A_STRING_ESCAPE_NONE] = "A STRING_ESCAPE_NONE", @@ -152,52 +259,125 @@ static const char *token_str[] = { [TK_END] = "END", }; -struct token { - enum token_type type; - union { - struct { - unsigned int next_rule; - unsigned int label_off; - unsigned int filename_off; - } rule; - struct { - enum key_operation op; - unsigned int value_off; - union { - unsigned int attr_off; - int ignore_error; - int i; - unsigned int rule_goto; - mode_t mode; - uid_t uid; - gid_t gid; - int num_fake_part; - int devlink_prio; - int event_timeout; - }; - } key; - }; -}; +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 *attr = &rules->buf[token->key.attr_off]; -#define MAX_TK 64 -struct rule_tmp { - struct udev_rules *rules; - struct token rule; - struct token token[MAX_TK]; - unsigned int token_cur; -}; + switch (type) { + case TK_RULE: + { + const char *tks_ptr = (char *)rules->tokens; + const char *tk_ptr = (char *)token; + unsigned int off = tk_ptr - tks_ptr; -struct udev_rules { - struct udev *udev; - int resolve_names; - struct token *tokens; - unsigned int token_cur; - unsigned int token_max; - char *buf; - size_t buf_cur; - size_t buf_max; - unsigned int buf_count; -}; + dbg(rules->udev, "* RULE %s:%u, off: %u(%u), token_count: %u(%u), label: '%s', flags: 0x%02x\n", + &rules->buf[token->rule.filename_off], token->rule.filename_line, + off / (unsigned int) sizeof(struct token), off, + token->rule.token_count, + token->rule.token_count * (unsigned int) sizeof(struct token), + &rules->buf[token->rule.label_off], + token->rule.flags); + break; + } + case TK_M_ACTION: + case TK_M_DEVPATH: + case TK_M_KERNEL: + case TK_M_SUBSYSTEM: + case TK_M_DRIVER: + case TK_M_WAITFOR: + case TK_M_DEVLINK: + case TK_M_NAME: + case TK_M_KERNELS: + case TK_M_SUBSYSTEMS: + case TK_M_DRIVERS: + case TK_M_PROGRAM: + case TK_M_IMPORT_FILE: + case TK_M_IMPORT_PROG: + case TK_M_IMPORT_PARENT: + case TK_M_RESULT: + case TK_A_NAME: + case TK_A_DEVLINK: + case TK_A_OWNER: + case TK_A_GROUP: + case TK_A_MODE: + case TK_A_RUN: + dbg(rules->udev, "%s %s '%s'(%s)\n", + token_str[type], operation_str[op], value, string_glob_str[glob]); + break; + case TK_M_ATTR: + case TK_M_ATTRS: + case TK_M_ENV: + case TK_A_ATTR: + case TK_A_ENV: + dbg(rules->udev, "%s %s '%s' '%s'(%s)\n", + token_str[type], operation_str[op], attr, value, string_glob_str[glob]); + break; + case TK_A_IGNORE_DEVICE: + case TK_A_STRING_ESCAPE_NONE: + case TK_A_STRING_ESCAPE_REPLACE: + case TK_A_LAST_RULE: + case TK_A_IGNORE_REMOVE: + dbg(rules->udev, "%s\n", token_str[type]); + break; + case TK_M_TEST: + dbg(rules->udev, "%s %s '%s'(%s) %#o\n", + token_str[type], operation_str[op], value, string_glob_str[glob], token->key.mode); + break; + case TK_A_NUM_FAKE_PART: + dbg(rules->udev, "%s %u\n", token_str[type], token->key.num_fake_part); + break; + case TK_A_DEVLINK_PRIO: + dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.devlink_prio); + break; + case TK_A_OWNER_ID: + dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.uid); + break; + case TK_A_GROUP_ID: + dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.gid); + break; + case TK_A_MODE_ID: + dbg(rules->udev, "%s %s %#o\n", token_str[type], operation_str[op], token->key.mode); + break; + case TK_A_EVENT_TIMEOUT: + dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.event_timeout); + break; + case TK_A_GOTO: + dbg(rules->udev, "%s '%s' %u\n", token_str[type], value, token->key.rule_goto); + break; + case TK_END: + dbg(rules->udev, "* %s\n", token_str[type]); + break; + case TK_M_PARENTS_MIN: + case TK_M_PARENTS_MAX: + case TK_M_MAX: + case TK_UNSET: + dbg(rules->udev, "unknown type %u\n", type); + break; + } +} + +static void dump_rules(struct udev_rules *rules) +{ + unsigned int i; + + dbg(rules->udev, "dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n", + rules->token_cur, + rules->token_cur * sizeof(struct token), + rules->buf_count, + rules->buf_cur); + for(i = 0; i < rules->token_cur; i++) + dump_token(rules, &rules->tokens[i]); +} +#else +static const char **operation_str; +static const char **token_str; +static inline void dump_token(struct udev_rules *rules, struct token *token) {} +static inline void dump_rules(struct udev_rules *rules) {} +#endif /* DEBUG */ /* we could lookup and return existing strings, or tails of strings */ static int add_string(struct udev_rules *rules, const char *str) @@ -205,19 +385,24 @@ static int add_string(struct udev_rules *rules, const char *str) size_t len = strlen(str)+1; int off; + /* offset 0 is always '\0' */ + if (str[0] == '\0') + return 0; + + /* grow buffer if needed */ if (rules->buf_cur + len+1 >= rules->buf_max) { char *buf; unsigned int add; /* double the buffer size */ add = rules->buf_max; - if (add < len) - add = len; + if (add < len * 8) + add = len * 8; buf = realloc(rules->buf, rules->buf_max + add); if (buf == NULL) return -1; - info(rules->udev, "extend buffer from %zu to %zu\n", rules->buf_max, rules->buf_max + add); + dbg(rules->udev, "extend buffer from %zu to %zu\n", rules->buf_max, rules->buf_max + add); rules->buf = buf; rules->buf_max += add; } @@ -231,19 +416,20 @@ static int add_string(struct udev_rules *rules, const char *str) static int add_token(struct udev_rules *rules, struct token *token) { + /* grow buffer if needed */ if (rules->token_cur+1 >= rules->token_max) { struct token *tokens; unsigned int add; /* double the buffer size */ add = rules->token_max; - if (add < 1) - add = 1; + if (add < 8) + add = 8; tokens = realloc(rules->tokens, (rules->token_max + add ) * sizeof(struct token)); if (tokens == NULL) return -1; - info(rules->udev, "extend tokens from %u to %u\n", rules->token_max, rules->token_max + add); + dbg(rules->udev, "extend tokens from %u to %u\n", rules->token_max, rules->token_max + add); rules->tokens = tokens; rules->token_max += add; } @@ -252,6 +438,92 @@ static int add_token(struct udev_rules *rules, struct token *token) return 0; } +static uid_t add_uid(struct udev_rules *rules, const char *owner) +{ + unsigned int i; + uid_t uid; + unsigned int off; + + /* lookup, if we know it already */ + for (i = 0; i < rules->uids_cur; i++) { + off = rules->uids[i].name_off; + if (strcmp(&rules->buf[off], owner) == 0) { + uid = rules->uids[i].uid; + dbg(rules->udev, "return existing %u for '%s'\n", uid, owner); + return uid; + } + } + uid = util_lookup_user(rules->udev, owner); + + /* grow buffer if needed */ + if (rules->uids_cur+1 >= rules->uids_max) { + struct uid_gid *uids; + unsigned int add; + + /* double the buffer size */ + add = rules->uids_max; + if (add < 1) + add = 8; + + uids = realloc(rules->uids, (rules->uids_max + add ) * sizeof(struct uid_gid)); + if (uids == NULL) + return uid; + dbg(rules->udev, "extend uids from %u to %u\n", rules->uids_max, rules->uids_max + add); + rules->uids = uids; + rules->uids_max += add; + } + rules->uids[rules->uids_cur].uid = uid; + off = add_string(rules, owner); + if (off <= 0) + return uid; + rules->uids[rules->uids_cur].name_off = off; + rules->uids_cur++; + return uid; +} + +static gid_t add_gid(struct udev_rules *rules, const char *group) +{ + unsigned int i; + gid_t gid; + unsigned int off; + + /* lookup, if we know it already */ + for (i = 0; i < rules->gids_cur; i++) { + off = rules->gids[i].name_off; + if (strcmp(&rules->buf[off], group) == 0) { + gid = rules->gids[i].gid; + dbg(rules->udev, "return existing %u for '%s'\n", gid, group); + return gid; + } + } + gid = util_lookup_group(rules->udev, group); + + /* grow buffer if needed */ + if (rules->gids_cur+1 >= rules->gids_max) { + struct uid_gid *gids; + unsigned int add; + + /* double the buffer size */ + add = rules->gids_max; + if (add < 1) + add = 8; + + gids = realloc(rules->gids, (rules->gids_max + add ) * sizeof(struct uid_gid)); + if (gids == NULL) + return gid; + dbg(rules->udev, "extend gids from %u to %u\n", rules->gids_max, rules->gids_max + add); + rules->gids = gids; + rules->gids_max += add; + } + rules->gids[rules->gids_cur].gid = gid; + off = add_string(rules, group); + if (off <= 0) + return gid; + rules->gids[rules->gids_cur].name_off = off; + rules->gids_cur++; + return gid; +} + static int import_property_from_string(struct udev_device *dev, char *line) { struct udev *udev = udev_device_get_udev(dev); @@ -308,7 +580,7 @@ static int import_property_from_string(struct udev_device *dev, char *line) val++; } - info(udev, "adding '%s'='%s'\n", key, val); + dbg(udev, "adding '%s'='%s'\n", key, val); /* handle device, renamed by external tool, returning new path */ if (strcmp(key, "DEVPATH") == 0) { @@ -402,11 +674,12 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout) { struct udev *udev = udev_device_get_udev(dev); char filepath[UTIL_PATH_SIZE]; - char devicepath[UTIL_PATH_SIZE] = ""; + char devicepath[UTIL_PATH_SIZE]; struct stat stats; int loop = timeout * WAIT_LOOP_PER_SECOND; /* a relative path is a device attribute */ + devicepath[0] = '\0'; if (file[0] != '/') { util_strlcpy(devicepath, udev_get_sys_path(udev), sizeof(devicepath)); util_strlcat(devicepath, udev_device_get_devpath(dev), sizeof(devicepath)); @@ -474,7 +747,7 @@ static int attr_subst_subdir(char *attr, size_t len) return found; } -static int get_key(struct udev *udev, char **line, char **key, enum key_operation *op, char **value) +static int get_key(struct udev *udev, char **line, char **key, enum operation_type *op, char **value) { char *linepos; char *temp; @@ -516,19 +789,19 @@ static int get_key(struct udev *udev, char **line, char **key, enum key_operatio /* get operation type */ if (linepos[0] == '=' && linepos[1] == '=') { - *op = KEY_OP_MATCH; + *op = OP_MATCH; linepos += 2; } else if (linepos[0] == '!' && linepos[1] == '=') { - *op = KEY_OP_NOMATCH; + *op = OP_NOMATCH; linepos += 2; } else if (linepos[0] == '+' && linepos[1] == '=') { - *op = KEY_OP_ADD; + *op = OP_ADD; linepos += 2; } else if (linepos[0] == '=') { - *op = KEY_OP_ASSIGN; + *op = OP_ASSIGN; linepos++; } else if (linepos[0] == ':' && linepos[1] == '=') { - *op = KEY_OP_ASSIGN_FINAL; + *op = OP_ASSIGN_FINAL; linepos += 2; } else return -1; @@ -542,13 +815,14 @@ static int get_key(struct udev *udev, char **line, char **key, enum key_operatio if (linepos[0] == '\0') return -1; - /* get the value*/ + /* get the value */ if (linepos[0] == '"') linepos++; else return -1; *value = linepos; + /* terminate */ temp = strchr(linepos, '"'); if (!temp) return -1; @@ -582,21 +856,23 @@ static char *get_key_attribute(struct udev *udev, char *str) return NULL; } -static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, - enum key_operation op, - const char *value, const void *data) +static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, + enum operation_type op, + const char *value, const void *data) { struct token *token = &rule_tmp->token[rule_tmp->token_cur]; const char *attr = data; - mode_t mode = 0000; + enum string_glob_type glob; + + memset(token, 0x00, sizeof(struct token)); switch (type) { - case TK_M_WAITFOR: case TK_M_ACTION: case TK_M_DEVPATH: case TK_M_KERNEL: case TK_M_SUBSYSTEM: case TK_M_DRIVER: + case TK_M_WAITFOR: case TK_M_DEVLINK: case TK_M_NAME: case TK_M_KERNELS: @@ -624,10 +900,9 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, token->key.attr_off = add_string(rule_tmp->rules, attr); break; case TK_M_TEST: - if (data != NULL) - mode = *(mode_t *)data; token->key.value_off = add_string(rule_tmp->rules, value); - token->key.mode = mode; + if (data != NULL) + token->key.mode = *(mode_t *)data; break; case TK_A_IGNORE_DEVICE: case TK_A_STRING_ESCAPE_NONE: @@ -658,14 +933,45 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, token->key.event_timeout = *(int *)data; break; case TK_RULE: - case TK_PARENTS_MAX: + case TK_M_PARENTS_MIN: + case TK_M_PARENTS_MAX: + case TK_M_MAX: case TK_END: - case TK_UNDEF: + case TK_UNSET: err(rule_tmp->rules->udev, "wrong type %u\n", type); return -1; } - token->type = type; + + glob = GL_PLAIN; + if (value != NULL) { + if (type < TK_M_MAX) { + /* check if we need to split or call fnmatch() while matching rules */ + int has_split; + int has_glob; + + has_split = (strchr(value, '|') != NULL); + has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL || + strchr(value, '[') != NULL || strchr(value, ']') != NULL); + if (has_split && has_glob) { + glob = GL_SPLIT_GLOB; + } else if (has_split) { + glob = GL_SPLIT; + } else if (has_glob) { + if (strcmp(value, "?*") == 0) + glob = GL_SOMETHING; + else + glob = GL_GLOB; + } + } else { + /* check if we need to substitute format strings for matching rules */ + if (strchr(value, '%') != NULL || strchr(value, '$') != NULL) + glob = GL_FORMAT; + } + } + + token->key.type = type; token->key.op = op; + token->key.glob = glob; rule_tmp->token_cur++; if (rule_tmp->token_cur >= ARRAY_SIZE(rule_tmp->token)) { err(rule_tmp->rules->udev, "temporary rule array too small\n"); @@ -674,117 +980,6 @@ static int rule_add_token(struct rule_tmp *rule_tmp, enum token_type type, return 0; } -#ifdef DEBUG -static void dump_token(struct udev_rules *rules, struct token *token) -{ - enum token_type type = token->type; - enum key_operation op = token->key.op; - const char *value = &rules->buf[token->key.value_off]; - const char *attr = &rules->buf[token->key.attr_off]; - - switch (type) { - case TK_RULE: - { - const char *tks_ptr = (char *)rules->tokens; - const char *tk_ptr = (char *)token; - unsigned int off = tk_ptr - tks_ptr; - - dbg(rules->udev, "* RULE '%s', off: %u(%u), next: %u, label: '%s'\n", - &rules->buf[token->rule.filename_off], - off / (unsigned int) sizeof(struct token), off, - token->rule.next_rule, - &rules->buf[token->rule.label_off]); - break; - } - case TK_M_WAITFOR: - case TK_M_ACTION: - case TK_M_DEVPATH: - case TK_M_KERNEL: - case TK_M_SUBSYSTEM: - case TK_M_DRIVER: - case TK_M_DEVLINK: - case TK_M_NAME: - case TK_M_KERNELS: - case TK_M_SUBSYSTEMS: - case TK_M_DRIVERS: - case TK_M_PROGRAM: - case TK_M_IMPORT_FILE: - case TK_M_IMPORT_PROG: - case TK_M_IMPORT_PARENT: - case TK_M_RESULT: - case TK_A_NAME: - case TK_A_DEVLINK: - case TK_A_OWNER: - case TK_A_GROUP: - case TK_A_MODE: - case TK_A_RUN: - dbg(rules->udev, "%s %s '%s'\n", token_str[type], operation_str[op], value); - break; - case TK_M_ATTR: - case TK_M_ATTRS: - case TK_M_ENV: - case TK_A_ATTR: - case TK_A_ENV: - dbg(rules->udev, "%s %s '%s' '%s'\n", token_str[type], operation_str[op], attr, value); - break; - case TK_A_IGNORE_DEVICE: - case TK_A_STRING_ESCAPE_NONE: - case TK_A_STRING_ESCAPE_REPLACE: - case TK_A_LAST_RULE: - case TK_A_IGNORE_REMOVE: - dbg(rules->udev, "%s\n", token_str[type]); - break; - case TK_M_TEST: - dbg(rules->udev, "%s %s '%s' %#o\n", token_str[type], operation_str[op], value, token->key.mode); - break; - case TK_A_NUM_FAKE_PART: - dbg(rules->udev, "%s %u\n", token_str[type], token->key.num_fake_part); - break; - case TK_A_DEVLINK_PRIO: - dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.devlink_prio); - break; - case TK_A_OWNER_ID: - dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.uid); - break; - case TK_A_GROUP_ID: - dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.gid); - break; - case TK_A_MODE_ID: - dbg(rules->udev, "%s %s %#o\n", token_str[type], operation_str[op], token->key.mode); - break; - case TK_A_EVENT_TIMEOUT: - dbg(rules->udev, "%s %s %u\n", token_str[type], operation_str[op], token->key.event_timeout); - break; - case TK_A_GOTO: - dbg(rules->udev, "%s '%s' %u\n", token_str[type], value, token->key.rule_goto); - break; - case TK_END: - dbg(rules->udev, "* %s\n", token_str[type]); - break; - case TK_PARENTS_MAX: - case TK_UNDEF: - dbg(rules->udev, "unknown type %u\n", type); - break; - } -} - -static void dump_rules(struct udev_rules *rules) -{ - unsigned int i; - - dbg(rules->udev, "dumping %u (%zu bytes) tokens, %u (%zu bytes) strings\n", - rules->token_cur, - rules->token_cur * sizeof(struct token), - rules->buf_count, - rules->buf_cur); - for(i = 0; i < rules->token_cur; i++) - dump_token(rules, &rules->tokens[i]); -} -#else -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 sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) { unsigned int i; @@ -792,15 +987,15 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) unsigned int end = rule_tmp->token_cur; for (i = 0; i < rule_tmp->token_cur; i++) { - enum token_type next_val = TK_UNDEF; + enum token_type next_val = TK_UNSET; unsigned int next_idx; unsigned int j; /* find smallest value */ for (j = start; j < end; j++) { - if (rule_tmp->token[j].type == TK_UNDEF) + if (rule_tmp->token[j].type == TK_UNSET) continue; - if (next_val == TK_UNDEF || rule_tmp->token[j].type < next_val) { + if (next_val == TK_UNSET || rule_tmp->token[j].type < next_val) { next_val = rule_tmp->token[j].type; next_idx = j; } @@ -809,7 +1004,7 @@ static int sort_token(struct udev_rules *rules, struct rule_tmp *rule_tmp) /* add token and mark done */ if (add_token(rules, &rule_tmp->token[next_idx]) != 0) return -1; - rule_tmp->token[next_idx].type = TK_UNDEF; + rule_tmp->token[next_idx].type = TK_UNSET; /* shrink range */ if (next_idx == start) @@ -833,48 +1028,49 @@ static int add_rule(struct udev_rules *rules, char *line, rule_tmp.rules = rules; rule_tmp.rule.type = TK_RULE; rule_tmp.rule.rule.filename_off = filename_off; + rule_tmp.rule.rule.filename_line = lineno; linepos = line; while (1) { char *key; char *value; - enum key_operation op = KEY_OP_UNSET; + enum operation_type op; if (get_key(rules->udev, &linepos, &key, &op, &value) != 0) break; if (strcasecmp(key, "ACTION") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid ACTION operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_ACTION, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "DEVPATH") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DEVPATH operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_DEVPATH, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "KERNEL") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid KERNEL operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_KERNEL, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "SUBSYSTEM") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid SUBSYSTEM operation\n"); goto invalid; } @@ -885,19 +1081,19 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0) err(rules->udev, "'%s' must be specified as 'subsystem' \n" "please fix it in %s:%u", value, filename, lineno); - rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL); + rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL); } else - rule_add_token(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "DRIVER") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DRIVER operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_DRIVER, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL); valid = 1; continue; } @@ -908,10 +1104,10 @@ static int add_rule(struct udev_rules *rules, char *line, err(rules->udev, "error parsing ATTR attribute\n"); goto invalid; } - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { - rule_add_token(&rule_tmp, TK_M_ATTR, op, value, attr); + if (op < OP_MATCH_MAX) { + rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr); } else { - rule_add_token(&rule_tmp, TK_A_ATTR, op, value, attr); + rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr); } valid = 1; continue; @@ -919,39 +1115,39 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcasecmp(key, "KERNELS") == 0 || strcasecmp(key, "ID") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid KERNELS operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_KERNELS, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "SUBSYSTEMS") == 0 || strcasecmp(key, "BUS") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid SUBSYSTEMS operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "DRIVERS") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid DRIVERS operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_DRIVERS, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL); valid = 1; continue; } if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 || strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid ATTRS operation\n"); goto invalid; } @@ -966,7 +1162,7 @@ static int add_rule(struct udev_rules *rules, char *line, else if (strstr(attr, "../") != NULL) err(rules->udev, "do not reference parent sysfs directories directly, " "it may break with a future kernel, please fix it in %s:%u", filename, lineno); - rule_add_token(&rule_tmp, TK_M_ATTRS, op, value, attr); + rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr); valid = 1; continue; } @@ -979,11 +1175,11 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strncmp(attr, "PHYSDEV", 7) == 0) physdev = 1; - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { - if (rule_add_token(&rule_tmp, TK_M_ENV, op, value, attr) != 0) + if (op < OP_MATCH_MAX) { + if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0) goto invalid; } else { - if (rule_add_token(&rule_tmp, TK_A_ENV, op, value, attr) != 0) + if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0) goto invalid; } valid = 1; @@ -991,17 +1187,17 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "PROGRAM") == 0) { - rule_add_token(&rule_tmp, TK_M_PROGRAM, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL); valid = 1; continue; } if (strcasecmp(key, "RESULT") == 0) { - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid RESULT operation\n"); goto invalid; } - rule_add_token(&rule_tmp, TK_M_RESULT, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL); valid = 1; continue; } @@ -1010,15 +1206,15 @@ static int add_rule(struct udev_rules *rules, char *line, attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1); if (attr != NULL && strstr(attr, "program")) { dbg(rules->udev, "IMPORT will be executed\n"); - rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL); valid = 1; } else if (attr != NULL && strstr(attr, "file")) { dbg(rules->udev, "IMPORT will be included as file\n"); - rule_add_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); valid = 1; } else if (attr != NULL && strstr(attr, "parent")) { dbg(rules->udev, "IMPORT will include the parent values\n"); - rule_add_token(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL); valid = 1; } else { /* figure it out if it is executable */ @@ -1043,11 +1239,11 @@ static int add_rule(struct udev_rules *rules, char *line, dbg(rules->udev, "IMPORT auto mode for '%s'\n", file); if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) { dbg(rules->udev, "IMPORT will be executed (autotype)\n"); - rule_add_token(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL); valid = 1; } else { dbg(rules->udev, "IMPORT will be included as file (autotype)\n"); - rule_add_token(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); valid = 1; } } @@ -1057,16 +1253,16 @@ static int add_rule(struct udev_rules *rules, char *line, if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) { mode_t mode = 0; - if (op != KEY_OP_MATCH && op != KEY_OP_NOMATCH) { + if (op > OP_MATCH_MAX) { err(rules->udev, "invalid TEST operation\n"); goto invalid; } attr = get_key_attribute(rules->udev, key + sizeof("TEST")-1); if (attr != NULL) { mode = strtol(attr, NULL, 8); - rule_add_token(&rule_tmp, TK_M_TEST, op, value, &mode); + rule_add_key(&rule_tmp, TK_M_TEST, op, value, &mode); } else { - rule_add_token(&rule_tmp, TK_M_TEST, op, value, NULL); + rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL); } valid = 1; continue; @@ -1078,13 +1274,13 @@ static int add_rule(struct udev_rules *rules, char *line, attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1); if (attr != NULL && strstr(attr, "ignore_error")) flag = 1; - rule_add_token(&rule_tmp, TK_A_RUN, op, value, &flag); + rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag); valid = 1; continue; } if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) { - rule_add_token(&rule_tmp, TK_M_WAITFOR, 0, value, NULL); + rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL); valid = 1; continue; } @@ -1096,43 +1292,45 @@ static int add_rule(struct udev_rules *rules, char *line, } if (strcasecmp(key, "GOTO") == 0) { - rule_add_token(&rule_tmp, TK_A_GOTO, 0, value, NULL); + rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL); valid = 1; continue; } if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) { - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) { - rule_add_token(&rule_tmp, TK_M_NAME, op, value, NULL); + if (op < OP_MATCH_MAX) { + rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL); } else { if (value[0] == '\0') dbg(rules->udev, "name empty, node creation suppressed\n"); - rule_add_token(&rule_tmp, TK_A_NAME, op, value, NULL); + rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL); attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1); if (attr != NULL) { if (strstr(attr, "all_partitions") != NULL) { int num = DEFAULT_FAKE_PARTITIONS_COUNT; dbg(rules->udev, "creation of partition nodes requested\n"); - rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); + rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); } if (strstr(attr, "ignore_remove") != NULL) { dbg(rules->udev, "remove event should be ignored\n"); - rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); } } } + rule_tmp.rule.rule.flags = 1; continue; } if (strcasecmp(key, "SYMLINK") == 0) { - if (op == KEY_OP_MATCH || op == KEY_OP_NOMATCH) - rule_add_token(&rule_tmp, TK_M_DEVLINK, op, value, NULL); - else - rule_add_token(&rule_tmp, TK_A_DEVLINK, op, value, NULL); - valid = 1; - continue; - } + if (op < OP_MATCH_MAX) + rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL); + else + rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL); + rule_tmp.rule.rule.flags = 1; + valid = 1; + continue; + } if (strcasecmp(key, "OWNER") == 0) { uid_t uid; @@ -1140,13 +1338,14 @@ static int add_rule(struct udev_rules *rules, char *line, uid = strtoul(value, &endptr, 10); if (endptr[0] == '\0') { - rule_add_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); + rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) { - uid = util_lookup_user(rules->udev, value); - rule_add_token(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); + uid = add_uid(rules, value); + rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid); } else { - rule_add_token(&rule_tmp, TK_A_OWNER, op, value, NULL); + rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL); } + rule_tmp.rule.rule.flags = 1; valid = 1; continue; } @@ -1157,13 +1356,14 @@ static int add_rule(struct udev_rules *rules, char *line, gid = strtoul(value, &endptr, 10); if (endptr[0] == '\0') { - rule_add_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); + rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); } else if (rules->resolve_names && strchr("$%", value[0]) == NULL) { - gid = util_lookup_group(rules->udev, value); - rule_add_token(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); + gid = add_gid(rules, value); + rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid); } else { - rule_add_token(&rule_tmp, TK_A_GROUP, op, value, NULL); + rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL); } + rule_tmp.rule.rule.flags = 1; valid = 1; continue; } @@ -1174,9 +1374,10 @@ static int add_rule(struct udev_rules *rules, char *line, mode = strtol(value, &endptr, 8); if (endptr[0] == '\0') - rule_add_token(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode); + rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode); else - rule_add_token(&rule_tmp, TK_A_MODE, op, value, NULL); + rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL); + rule_tmp.rule.rule.flags = 1; valid = 1; continue; } @@ -1186,42 +1387,42 @@ static int add_rule(struct udev_rules *rules, char *line, if (strstr(value, "last_rule") != NULL) { dbg(rules->udev, "last rule to be applied\n"); - rule_add_token(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_LAST_RULE, 0, NULL, NULL); } if (strstr(value, "ignore_device") != NULL) { dbg(rules->udev, "device should be ignored\n"); - rule_add_token(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_IGNORE_DEVICE, 0, NULL, NULL); } if (strstr(value, "ignore_remove") != NULL) { dbg(rules->udev, "remove event should be ignored\n"); - rule_add_token(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL); } pos = strstr(value, "link_priority="); if (pos != NULL) { int prio = atoi(&pos[strlen("link_priority=")]); - rule_add_token(&rule_tmp, TK_A_DEVLINK_PRIO, 0, NULL, &prio); + rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, 0, 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=")]); - rule_add_token(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout); + rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout); dbg(rules->udev, "event timout=%i\n", tout); } pos = strstr(value, "string_escape="); if (pos != NULL) { pos = &pos[strlen("string_escape=")]; if (strncmp(pos, "none", strlen("none")) == 0) - rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, 0, NULL, NULL); else if (strncmp(pos, "replace", strlen("replace")) == 0) - rule_add_token(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL); + rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL); } if (strstr(value, "all_partitions") != NULL) { int num = DEFAULT_FAKE_PARTITIONS_COUNT; - rule_add_token(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); + rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num); dbg(rules->udev, "creation of partition nodes requested\n"); } valid = 1; @@ -1239,22 +1440,23 @@ static int add_rule(struct udev_rules *rules, char *line, goto invalid; /* add rule token */ + rule_tmp.rule.rule.token_count = 1 + rule_tmp.token_cur; if (add_token(rules, &rule_tmp.rule) != 0) goto invalid; /* add tokens to list, sorted by type */ if (sort_token(rules, &rule_tmp) != 0) goto invalid; + return 0; invalid: err(rules->udev, "invalid rule '%s:%u'\n", filename, lineno); return -1; } -static int parse_file(struct udev_rules *rules, const char *filename) +static int parse_file(struct udev_rules *rules, const char *filename, unsigned short filename_off) { FILE *f; - unsigned int filename_off; unsigned int first_token; char line[UTIL_LINE_SIZE]; int line_nr = 0; @@ -1266,7 +1468,6 @@ static int parse_file(struct udev_rules *rules, const char *filename) if (f == NULL) return -1; - filename_off = add_string(rules, filename); first_token = rules->token_cur; while(fgets(line, sizeof(line), f) != NULL) { @@ -1327,7 +1528,6 @@ static int parse_file(struct udev_rules *rules, const char *filename) static int add_matching_files(struct udev *udev, struct udev_list_node *file_list, const char *dirname, const char *suffix) { - struct dirent *ent; DIR *dir; char filename[UTIL_PATH_SIZE]; @@ -1339,26 +1539,28 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis } while (1) { - ent = readdir(dir); - if (ent == NULL || ent->d_name[0] == '\0') + struct dirent *dent; + + dent = readdir(dir); + if (dent == NULL || dent->d_name[0] == '\0') break; - if ((ent->d_name[0] == '.') || (ent->d_name[0] == '#')) + if (dent->d_name[0] == '.') continue; /* look for file matching with specified suffix */ if (suffix != NULL) { const char *ext; - ext = strrchr(ent->d_name, '.'); + ext = strrchr(dent->d_name, '.'); if (ext == NULL) continue; if (strcmp(ext, suffix) != 0) continue; } - dbg(udev, "put file '%s/%s' into list\n", dirname, ent->d_name); + dbg(udev, "put file '%s/%s' into list\n", dirname, dent->d_name); - snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name); + snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->d_name); filename[sizeof(filename)-1] = '\0'; udev_list_entry_add(udev, file_list, filename, NULL, 1, 1); } @@ -1371,12 +1573,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { struct udev_rules *rules; struct stat statbuf; - char filename[PATH_MAX]; struct udev_list_node file_list; struct udev_list_entry *file_loop, *file_tmp; - unsigned int prev_rule; struct token end_token; - unsigned int i; rules = malloc(sizeof(struct udev_rules)); if (rules == NULL) @@ -1388,20 +1587,24 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) /* init token array and string buffer */ rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token)); - if (rules->tokens != NULL) - rules->token_max = PREALLOC_TOKEN; + if (rules->tokens == NULL) + return NULL; + rules->token_max = PREALLOC_TOKEN; rules->buf = malloc(PREALLOC_STRBUF); - if (rules->buf != NULL) - rules->buf_max = PREALLOC_STRBUF; - info(udev, "prealloc %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); - /* offset 0 in the string buffer is always empty */ - add_string(rules, ""); + if (rules->buf == NULL) + return NULL; + rules->buf_max = PREALLOC_STRBUF; + /* offset 0 is always '\0' */ + rules->buf[0] = '\0'; + rules->buf_cur = 1; + dbg(udev, "prealloc %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); if (udev_get_rules_path(udev) != NULL) { /* custom rules location for testing */ add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules"); } else { + char filename[PATH_MAX]; struct udev_list_node sort_list; struct udev_list_entry *sort_loop, *sort_tmp; @@ -1430,7 +1633,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) if (sort_base == NULL) continue; - + /* sort entry into existing list */ udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) { const char *file_name = udev_list_entry_get_name(file_loop); const char *file_base = strrchr(file_name, '/'); @@ -1440,34 +1643,55 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) if (strcmp(file_base, sort_base) == 0) { info(udev, "rule file basename '%s' already added, ignoring '%s'\n", file_name, sort_name); - udev_list_entry_remove(sort_loop); + udev_list_entry_delete(sort_loop); sort_loop = NULL; break; } - if (strcmp(file_base, sort_base) > 0) + if (strcmp(file_base, sort_base) > 0) { + /* found later file, insert before */ + udev_list_entry_remove(sort_loop); + udev_list_entry_insert_before(sort_loop, file_loop); + sort_loop = NULL; break; + } } - if (sort_loop != NULL) - udev_list_entry_move_before(sort_loop, file_loop); + /* current file already handled */ + if (sort_loop == NULL) + continue; + /* no later file, append to end of list */ + udev_list_entry_remove(sort_loop); + udev_list_entry_append(sort_loop, &file_list); } } + /* add all filenames to the string buffer */ + udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) { + const char *filename = udev_list_entry_get_name(file_loop); + unsigned int filename_off; + + filename_off = add_string(rules, filename); + /* the offset in the rule is limited to unsigned short */ + if (filename_off < USHRT_MAX) + udev_list_entry_set_flag(file_loop, filename_off); + } + /* parse list of files */ udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) { - const char *file_name = udev_list_entry_get_name(file_loop); + const char *filename = udev_list_entry_get_name(file_loop); + unsigned int filename_off = udev_list_entry_get_flag(file_loop); - if (stat(file_name, &statbuf) == 0 && statbuf.st_size > 0) - parse_file(rules, file_name); + if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0) + parse_file(rules, filename, filename_off); else - info(udev, "can not read '%s'\n", file_name); - udev_list_entry_remove(file_loop); + info(udev, "can not read '%s'\n", filename); + udev_list_entry_delete(file_loop); } memset(&end_token, 0x00, sizeof(struct token)); end_token.type = TK_END; add_token(rules, &end_token); - /* shrink allocate buffers */ + /* shrink allocated token and string buffer */ if (rules->token_cur < rules->token_max) { struct token *tokens; @@ -1489,14 +1713,16 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) info(udev, "shrunk to %lu bytes tokens (%u * %zu bytes), %zu bytes buffer\n", rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max); - /* link all TK_RULE tokens to be able to fast-forward to next TK_RULE */ - prev_rule = 0; - for (i = 1; i < rules->token_cur; i++) { - if (rules->tokens[i].type == TK_RULE) { - rules->tokens[prev_rule].rule.next_rule = i; - prev_rule = i; - } - } + /* cleanup uid/gid cache */ + free(rules->uids); + rules->uids = NULL; + rules->uids_cur = 0; + rules->uids_max = 0; + free(rules->gids); + rules->gids = NULL; + rules->gids_cur = 0; + rules->gids_max = 0; + dump_rules(rules); return rules; } @@ -1507,12 +1733,13 @@ void udev_rules_unref(struct udev_rules *rules) return; free(rules->tokens); free(rules->buf); + free(rules->uids); + free(rules->gids); free(rules); } static int match_key(struct udev_rules *rules, struct token *token, const char *val) { - const char *key_name = token_str[token->type]; char *key_value = &rules->buf[token->key.value_off]; char *pos; int match = 0; @@ -1520,59 +1747,100 @@ static int match_key(struct udev_rules *rules, struct token *token, const char * if (val == NULL) val = ""; - /* look for a matching string, parts are separated by '|' */ - if (strchr(key_value, '|') != NULL) { - char value[UTIL_PATH_SIZE]; + switch (token->key.glob) { + case GL_PLAIN: + match = (strcmp(key_value, val) == 0); + break; + case GL_GLOB: + match = (fnmatch(key_value, val, 0) == 0); + break; + case GL_SPLIT: + { + const char *split; + size_t len; - util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value)); - key_value = value; - while (key_value != NULL) { - pos = strchr(key_value, '|'); - if (pos != NULL) { - pos[0] = '\0'; - pos = &pos[1]; + split = &rules->buf[token->key.value_off]; + len = strlen(val); + while (1) { + const char *next; + + next = strchr(split, '|'); + if (next != NULL) { + size_t matchlen = (size_t)(next - split); + + match = (matchlen == len && strncmp(split, val, matchlen) == 0); + if (match) + break; + } else { + match = (strcmp(split, val) == 0); + break; + } + split = &next[1]; } - dbg(rules->udev, "match %s '%s' <-> '%s'\n", key_name, key_value, val); - match = (fnmatch(key_value, val, 0) == 0); - if (match) - break; - key_value = pos; + break; } - } else { - match = (fnmatch(key_value, val, 0) == 0); + case GL_SPLIT_GLOB: + { + char value[UTIL_PATH_SIZE]; + + util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value)); + key_value = value; + while (key_value != NULL) { + pos = strchr(key_value, '|'); + if (pos != NULL) { + pos[0] = '\0'; + pos = &pos[1]; + } + dbg(rules->udev, "match %s '%s' <-> '%s'\n", token_str[token->type], key_value, val); + match = (fnmatch(key_value, val, 0) == 0); + if (match) + break; + key_value = pos; + } + break; + } + case GL_SOMETHING: + match = (val[0] != '\0'); + break; + case GL_FORMAT: + case GL_UNSET: + return -1; } - if (match && (token->key.op == KEY_OP_MATCH)) { - dbg(rules->udev, "%s is true (matching value)\n", key_name); + if (match && (token->key.op == OP_MATCH)) { + dbg(rules->udev, "%s is true (matching value)\n", token_str[token->type]); return 0; } - if (!match && (token->key.op == KEY_OP_NOMATCH)) { - dbg(rules->udev, "%s is true (non-matching value)\n", key_name); + if (!match && (token->key.op == OP_NOMATCH)) { + dbg(rules->udev, "%s is true (non-matching value)\n", token_str[token->type]); return 0; } - dbg(rules->udev, "%s is not true\n", key_name); + dbg(rules->udev, "%s is not true\n", token_str[token->type]); return -1; } static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct udev_event *event, struct token *cur) { - char attr[UTIL_PATH_SIZE]; const char *key_name = &rules->buf[cur->key.attr_off]; const char *key_value = &rules->buf[cur->key.value_off]; - char value[UTIL_NAME_SIZE] = ""; + char value[UTIL_NAME_SIZE]; size_t len; - util_strlcpy(attr, key_name, sizeof(attr)); - util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1); + value[0] = '\0'; + if (key_name[0] == '[') { + char attr[UTIL_PATH_SIZE]; + + util_strlcpy(attr, key_name, sizeof(attr)); + util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1); + } if (value[0] == '\0') { const char *val; val = udev_device_get_sysattr_value(dev, key_name); - if (val != NULL) - util_strlcpy(value, val, sizeof(value)); + if (val == NULL) + return -1; + util_strlcpy(value, val, sizeof(value)); } - if (value[0]=='\0') - return -1; /* strip trailing whitespace of value, if not asked to match for it */ len = strlen(key_value); @@ -1593,37 +1861,33 @@ enum escape_type { int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event) { - struct token *rule; struct token *cur; + struct token *rule; + enum escape_type esc = ESCAPE_UNSET; + int can_set_name; if (rules->tokens == NULL) return -1; + can_set_name = ((strcmp(udev_device_get_action(event->dev), "add") == 0 || + strcmp(udev_device_get_action(event->dev), "change") == 0) && + (major(udev_device_get_devnum(event->dev)) > 0 || + strcmp(udev_device_get_subsystem(event->dev), "net") == 0)); + /* loop through token list, match, run actions or forward to next rule */ cur = &rules->tokens[0]; - while (cur != NULL && cur->type != TK_END) { - enum escape_type esc = ESCAPE_UNSET; - unsigned int idx; - + rule = cur; + while (1) { dump_token(rules, cur); switch (cur->type) { case TK_RULE: /* current rule */ rule = cur; + /* possibly skip rules which want to set NAME, SYMLINK, OWNER, GROUP, MODE */ + if (!can_set_name && rule->rule.flags) + ;//goto nomatch; esc = ESCAPE_UNSET; break; - case TK_M_WAITFOR: - { - char filename[UTIL_PATH_SIZE]; - int found; - - util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename)); - udev_event_apply_format(event, filename, sizeof(filename)); - found = (wait_for_file(event->dev, filename, 10) == 0); - if (!found && (cur->key.op != KEY_OP_NOMATCH)) - goto nomatch; - break; - } case TK_M_ACTION: if (match_key(rules, cur, udev_device_get_action(event->dev)) != 0) goto nomatch; @@ -1684,6 +1948,18 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (match_key(rules, cur, udev_device_get_driver(event->dev)) != 0) goto nomatch; break; + case TK_M_WAITFOR: + { + char filename[UTIL_PATH_SIZE]; + int found; + + util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename)); + udev_event_apply_format(event, filename, sizeof(filename)); + found = (wait_for_file(event->dev, filename, 10) == 0); + if (!found && (cur->key.op != OP_NOMATCH)) + goto nomatch; + break; + } case TK_M_ATTR: if (match_attr(rules, event->dev, event, cur) != 0) goto nomatch; @@ -1697,7 +1973,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event /* get whole sequence of parent matches */ next = cur; - while (next->type < TK_PARENTS_MAX) + while (next->type > TK_M_PARENTS_MIN && next->type < TK_M_PARENTS_MAX) next++; /* loop over parents */ @@ -1765,15 +2041,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event attr_subst_subdir(filename, sizeof(filename)); match = (stat(filename, &statbuf) == 0); - info(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n"); + dbg(event->udev, "'%s' %s", filename, match ? "exists\n" : "does not exist\n"); if (match && cur->key.mode > 0) { match = ((statbuf.st_mode & cur->key.mode) > 0); - info(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode, - match ? "matches" : "does not match", cur->key.mode); + dbg(event->udev, "'%s' has mode=%#o and %s %#o\n", filename, statbuf.st_mode, + match ? "matches" : "does not match", cur->key.mode); } - if (match && cur->key.op == KEY_OP_NOMATCH) + if (match && cur->key.op == OP_NOMATCH) goto nomatch; - if (!match && cur->key.op == KEY_OP_MATCH) + if (!match && cur->key.op == OP_MATCH) goto nomatch; break; } @@ -1788,21 +2064,25 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(program, &rules->buf[cur->key.value_off], sizeof(program)); udev_event_apply_format(event, program, sizeof(program)); envp = udev_device_get_properties_envp(event->dev); + info(event->udev, "PROGRAM '%s' %s:%u\n", + program, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL) != 0) { - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; } else { int count; util_remove_trailing_chars(result, '\n'); if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) { - count = util_replace_chars(result, ALLOWED_CHARS_INPUT); + count = udev_util_replace_chars(result, UDEV_ALLOWED_CHARS_INPUT); if (count > 0) info(event->udev, "%i character(s) replaced\n" , count); } event->program_result = strdup(result); dbg(event->udev, "storing result '%s'\n", event->program_result); - if (cur->key.op == KEY_OP_NOMATCH) + if (cur->key.op == OP_NOMATCH) goto nomatch; } break; @@ -1814,7 +2094,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); if (import_file_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -1824,8 +2104,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); + info(event->udev, "IMPORT '%s' %s:%u\n", + import, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); if (import_program_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -1836,7 +2120,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import)); udev_event_apply_format(event, import, sizeof(import)); if (import_parent_into_properties(event->dev, import) != 0) - if (cur->key.op != KEY_OP_NOMATCH) + if (cur->key.op != OP_NOMATCH) goto nomatch; break; } @@ -1871,11 +2155,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->owner_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = 1; util_strlcpy(owner, &rules->buf[cur->key.value_off], sizeof(owner)); udev_event_apply_format(event, owner, sizeof(owner)); event->uid = util_lookup_user(event->udev, owner); + info(event->udev, "OWNER %u %s:%u\n", + event->uid, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; } case TK_A_GROUP: @@ -1884,11 +2172,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->group_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = 1; util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group)); udev_event_apply_format(event, group, sizeof(group)); event->gid = util_lookup_group(event->udev, group); + info(event->udev, "GROUP %u %s:%u\n", + event->gid, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; } case TK_A_MODE: @@ -1898,7 +2190,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->mode_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->mode_final = 1; util_strlcpy(mode, &rules->buf[cur->key.value_off], sizeof(mode)); udev_event_apply_format(event, mode, sizeof(mode)); @@ -1907,28 +2199,44 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event err(event->udev, "invalide mode '%s' set default mode 0660\n", mode); event->mode = 0660; } + info(event->udev, "MODE %#o %s:%u\n", + event->mode, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; } case TK_A_OWNER_ID: if (event->owner_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->owner_final = 1; event->uid = cur->key.uid; + info(event->udev, "OWNER %u %s:%u\n", + event->uid, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; case TK_A_GROUP_ID: if (event->group_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->group_final = 1; event->gid = cur->key.gid; + info(event->udev, "GROUP %u %s:%u\n", + event->gid, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; case TK_A_MODE_ID: if (event->mode_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->mode_final = 1; event->mode = cur->key.mode; + info(event->udev, "MODE %#o %s:%u\n", + event->mode, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); break; case TK_A_ENV: { @@ -1957,7 +2265,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->name_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN_FINAL) event->name_final = 1; if (name[0] == '\0') { free(event->name); @@ -1967,10 +2275,15 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(name_str, name, sizeof(name_str)); udev_event_apply_format(event, name_str, sizeof(name_str)); if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) { - count = util_replace_chars(name_str, ALLOWED_CHARS_FILE); + count = udev_util_replace_chars(name_str, "/"); if (count > 0) info(event->udev, "%i character(s) replaced\n", count); + free(event->name); event->name = strdup(name_str); + info(event->udev, "NAME '%s' %s:%u\n", + event->name, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); } break; } @@ -1983,18 +2296,20 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event if (event->devlink_final) break; - if (cur->key.op == KEY_OP_ASSIGN_FINAL) + if (major(udev_device_get_devnum(event->dev)) == 0) + break; + if (cur->key.op == OP_ASSIGN_FINAL) event->devlink_final = 1; - if (cur->key.op == KEY_OP_ASSIGN || cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_device_cleanup_devlinks_list(event->dev); /* allow multiple symlinks separated by spaces */ util_strlcpy(temp, &rules->buf[cur->key.value_off], sizeof(temp)); udev_event_apply_format(event, temp, sizeof(temp)); if (esc == ESCAPE_UNSET) - count = util_replace_chars(temp, ALLOWED_CHARS_FILE " "); + count = udev_util_replace_chars(temp, "/ "); else if (esc == ESCAPE_REPLACE) - count = util_replace_chars(temp, ALLOWED_CHARS_FILE); + count = udev_util_replace_chars(temp, "/"); if (count > 0) info(event->udev, "%i character(s) replaced\n" , count); dbg(event->udev, "rule applied, added symlink(s) '%s'\n", temp); @@ -2004,7 +2319,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event next = strchr(pos, ' '); while (next) { next[0] = '\0'; - info(event->udev, "add symlink '%s'\n", pos); + info(event->udev, "LINK '%s' %s:%u\n", + pos, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename)); util_strlcat(filename, "/", sizeof(filename)); util_strlcat(filename, pos, sizeof(filename)); @@ -2015,7 +2333,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event next = strchr(pos, ' '); } if (pos[0] != '\0') { - info(event->udev, "add symlink '%s'\n", pos); + info(event->udev, "LINK '%s' %s:%u\n", + pos, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename)); util_strlcat(filename, "/", sizeof(filename)); util_strlcat(filename, pos, sizeof(filename)); @@ -2047,7 +2368,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event util_strlcpy(value, &rules->buf[cur->key.value_off], sizeof(value)); udev_event_apply_format(event, value, sizeof(value)); - info(event->udev, "writing '%s' to sysfs file '%s'\n", value, attr); + info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value, + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); f = fopen(attr, "w"); if (f != NULL) { if (!event->test) @@ -2063,8 +2386,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event { struct udev_list_entry *list_entry; - if (cur->key.op == KEY_OP_ASSIGN || cur->key.op == KEY_OP_ASSIGN_FINAL) + if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL) udev_list_cleanup_entries(event->udev, &event->run_list); + info(event->udev, "RUN '%s' %s:%u\n", + &rules->buf[cur->key.value_off], + &rules->buf[rule->rule.filename_off], + rule->rule.filename_line); list_entry = udev_list_entry_add(event->udev, &event->run_list, &rules->buf[cur->key.value_off], NULL, 1, 0); if (cur->key.ignore_error) @@ -2075,11 +2402,13 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event cur = &rules->tokens[cur->key.rule_goto]; continue; case TK_A_LAST_RULE: - break; - - case TK_PARENTS_MAX: case TK_END: - case TK_UNDEF: + return 0; + + case TK_M_PARENTS_MIN: + case TK_M_PARENTS_MAX: + case TK_M_MAX: + case TK_UNSET: err(rules->udev, "wrong type %u\n", cur->type); goto nomatch; } @@ -2088,11 +2417,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event continue; nomatch: /* fast-forward to next rule */ - idx = rule->rule.next_rule; - if (idx == 0) - break; - dbg(rules->udev, "forward to rule: %u\n", idx); - cur = &rules->tokens[idx]; + cur = rule + rule->rule.token_count; + dbg(rules->udev, "forward to rule: %u\n", + (unsigned int) (cur - rules->tokens)); } - return 0; }