X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=6f82fac8415fb7ba3b6e86316cf637d746ea1119;hp=3dc77855da29359f38b354236d92901c9d547877;hb=821d0ec803a72841f173739f5b713fe847edab75;hpb=ca4c984cf5a2ee3e8d61d16bb3391ed6ff5f4cc7 diff --git a/udev_rules.c b/udev_rules.c index 3dc77855d..6f82fac84 100644 --- a/udev_rules.c +++ b/udev_rules.c @@ -31,7 +31,6 @@ #include #include #include -#include #include "libsysfs/sysfs/libsysfs.h" #include "list.h" @@ -43,7 +42,6 @@ #include "udev_rules.h" #include "udev_db.h" -static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr); /* compare string with pattern (supports * ? [0-9] [!A-Z]) */ static int strcmp_pattern(const char *p, const char *s) @@ -107,7 +105,7 @@ static char *get_format_attribute(char **str) if (*str[0] == '{') { pos = strchr(*str, '}'); if (pos == NULL) { - dbg("missing closing brace for format"); + err("missing closing brace for format"); return NULL; } pos[0] = '\0'; @@ -131,7 +129,7 @@ static int get_format_len(char **str) dbg("format length=%i", num); return num; } else { - dbg("format parsing error '%s'", *str); + err("format parsing error '%s'", *str); } } return -1; @@ -167,6 +165,33 @@ static int find_free_number(struct udevice *udev, const char *name) } } +static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, + const char *name, char *value, size_t len) +{ + struct sysfs_attribute *tmpattr; + + dbg("look for device attribute '%s'", name); + if (class_dev) { + tmpattr = sysfs_get_classdev_attr(class_dev, name); + if (tmpattr) + goto attr_found; + } + if (sysfs_device) { + tmpattr = sysfs_get_device_attr(sysfs_device, name); + if (tmpattr) + goto attr_found; + } + + return -1; + +attr_found: + strlcpy(value, tmpattr->value, len); + remove_trailing_char(value, '\n'); + + dbg("found attribute '%s'", tmpattr->path); + return 0; +} + static void apply_format(struct udevice *udev, char *string, size_t maxsize, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device) { @@ -176,7 +201,6 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, int len; int i; char c; - struct sysfs_attribute *tmpattr; unsigned int next_free_number; struct sysfs_class_device *class_dev_parent; @@ -239,7 +263,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, cpos++; } if (i > 0) { - dbg("requested part of result string not found"); + err("requested part of result string not found"); break; } strlcpy(temp2, cpos, sizeof(temp2)); @@ -257,30 +281,31 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, } break; case 's': - if (!class_dev) - break; if (attr == NULL) { dbg("missing attribute"); break; } - tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr); - if (tmpattr == NULL) { - dbg("sysfa attribute '%s' not found", attr); - break; - } - /* strip trailing whitespace of matching value */ - if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) { - i = len = strlen(tmpattr->value); - while (i > 0 && isspace(tmpattr->value[i-1])) - i--; - if (i < len) { - tmpattr->value[i] = '\0'; - dbg("remove %i trailing whitespace chars from '%s'", - len - i, tmpattr->value); + if (find_sysfs_attribute(class_dev, sysfs_device, attr, temp2, sizeof(temp2)) != 0) { + struct sysfs_device *parent_device; + + dbg("sysfs attribute '%s' not found, walk up the physical devices", attr); + parent_device = sysfs_get_device_parent(sysfs_device); + while (parent_device) { + dbg("looking at '%s'", parent_device->path); + if (find_sysfs_attribute(NULL, parent_device, attr, temp2, sizeof(temp2)) == 0) + break; + parent_device = sysfs_get_device_parent(parent_device); } + if (!parent_device) + break; } - strlcat(string, tmpattr->value, maxsize); - dbg("substitute sysfs value '%s'", tmpattr->value); + /* strip trailing whitespace of sysfs value */ + i = strlen(temp2); + while (i > 0 && isspace(temp2[i-1])) + temp2[--i] = '\0'; + replace_untrusted_chars(temp2); + strlcat(string, temp2, maxsize); + dbg("substitute sysfs value '%s'", temp2); break; case '%': strlcat(string, "%", maxsize); @@ -301,7 +326,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, struct udevice udev_parent; dbg("found parent '%s', get the node name", class_dev_parent->path); - udev_init_device(&udev_parent, NULL, NULL); + udev_init_device(&udev_parent, NULL, NULL, NULL); /* lookup the name in the udev_db with the DEVPATH of the parent */ if (udev_db_get_device(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) { strlcat(string, udev_parent.name, maxsize); @@ -327,7 +352,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, dbg("substitute udev_root '%s'", udev_root); break; default: - dbg("unknown substitution type '%%%c'", c); + err("unknown substitution type '%%%c'", c); break; } /* truncate to specified length */ @@ -338,21 +363,22 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize, } } -static int execute_program(struct udevice *udev, const char *path, char *value, int len) +static int execute_program_pipe(const char *command, const char *subsystem, char *value, int len) { int retval; int count; int status; - int fds[2]; + int pipefds[2]; pid_t pid; char *pos; char arg[PATH_SIZE]; char *argv[(sizeof(arg) / 2) + 1]; + int devnull; int i; - strlcpy(arg, path, sizeof(arg)); + strlcpy(arg, command, sizeof(arg)); i = 0; - if (strchr(path, ' ')) { + if (strchr(arg, ' ')) { pos = arg; while (pos != NULL) { if (pos[0] == '\'') { @@ -371,59 +397,60 @@ static int execute_program(struct udevice *udev, const char *path, char *value, dbg("execute '%s' with parsed arguments", arg); } else { argv[0] = arg; - argv[1] = udev->subsystem; + argv[1] = (char *) subsystem; argv[2] = NULL; dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]); } - retval = pipe(fds); + retval = pipe(pipefds); if (retval != 0) { - dbg("pipe failed"); + err("pipe failed"); return -1; } pid = fork(); switch(pid) { case 0: - /* child */ - /* dup2 write side of pipe to STDOUT */ - dup2(fds[1], STDOUT_FILENO); + /* child dup2 write side of pipe to STDOUT */ + devnull = open("/dev/null", O_RDWR); + if (devnull >= 0) { + dup2(devnull, STDIN_FILENO); + dup2(devnull, STDERR_FILENO); + close(devnull); + } + dup2(pipefds[1], STDOUT_FILENO); retval = execv(arg, argv); - - info(KEY_PROGRAM " execution of '%s' failed", path); - exit(1); + err("exec of program failed"); + _exit(1); case -1: - dbg("fork failed"); - return -1; + err("fork of '%s' failed", arg); + retval = -1; + break; default: - /* parent reads from fds[0] */ - close(fds[1]); + /* parent reads from pipefds[0] */ + close(pipefds[1]); retval = 0; i = 0; while (1) { - count = read(fds[0], value + i, len - i-1); - if (count <= 0) + count = read(pipefds[0], value + i, len - i-1); + if (count < 0) { + err("read failed with '%s'", strerror(errno)); + retval = -1; + } + + if (count == 0) break; i += count; if (i >= len-1) { - dbg("result len %d too short", len); + err("result len %d too short", len); retval = -1; break; } } - - if (count < 0) { - dbg("read failed with '%s'", strerror(errno)); - retval = -1; - } - - if (i > 0 && value[i-1] == '\n') - i--; value[i] = '\0'; - dbg("result is '%s'", value); - close(fds[0]); + close(pipefds[0]); waitpid(pid, &status, 0); if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) { @@ -431,80 +458,41 @@ static int execute_program(struct udevice *udev, const char *path, char *value, retval = -1; } } - return retval; -} - -static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr) -{ - struct sysfs_attribute *tmpattr = NULL; - char *c; - - dbg("look for device attribute '%s'", attr); - /* try to find the attribute in the class device directory */ - tmpattr = sysfs_get_classdev_attr(class_dev, attr); - if (tmpattr) - goto attr_found; - /* look in the class device directory if present */ - if (sysfs_device) { - tmpattr = sysfs_get_device_attr(sysfs_device, attr); - if (tmpattr) - goto attr_found; - } - - return NULL; - -attr_found: - c = strchr(tmpattr->value, '\n'); - if (c != NULL) - c[0] = '\0'; + if (!retval) { + remove_trailing_char(value, '\n'); + dbg("result is '%s'", value); + replace_untrusted_chars(value); + } else + value[0] = '\0'; - dbg("found attribute '%s'", tmpattr->path); - return tmpattr; + return retval; } -static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct key_pair *pair) +static int match_rule(struct udevice *udev, struct udev_rule *rule, + struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device) { - struct sysfs_attribute *tmpattr; - int i; - int len; - - if ((pair == NULL) || (pair->name[0] == '\0') || (pair->value == '\0')) - return -ENODEV; - - tmpattr = find_sysfs_attribute(class_dev, sysfs_device, pair->name); - if (tmpattr == NULL) - return -ENODEV; - - /* strip trailing whitespace of value, if not asked to match for it */ - if (! isspace(pair->value[strlen(pair->value)-1])) { - i = len = strlen(tmpattr->value); - while (i > 0 && isspace(tmpattr->value[i-1])) - i--; - if (i < len) { - tmpattr->value[i] = '\0'; - dbg("remove %i trailing whitespace chars from '%s'", - len - i, tmpattr->value); + struct sysfs_device *parent_device = sysfs_device; + + if (rule->action_operation != KEY_OP_UNSET) { + dbg("check for " KEY_ACTION " rule->action='%s' udev->action='%s'", + rule->action, udev->action); + if (strcmp_pattern(rule->action, udev->action) != 0) { + dbg(KEY_ACTION " is not matching"); + if (rule->action_operation != KEY_OP_NOMATCH) + goto exit; + } else { + dbg(KEY_ACTION " matches"); + if (rule->action_operation == KEY_OP_NOMATCH) + goto exit; } + dbg(KEY_ACTION " key is true"); } - dbg("compare attribute '%s' value '%s' with '%s'", - pair->name, tmpattr->value, pair->value); - if (strcmp_pattern(pair->value, tmpattr->value) != 0) - return -ENODEV; - - dbg("found matching attribute '%s' with value '%s'", - pair->name, pair->value); - return 0; -} - -static int match_rule(struct udevice *udev, struct udev_rule *rule, - struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device) -{ - if (rule->kernel[0] != '\0') { - dbg("check for " KEY_KERNEL " rule->kernel='%s' class_dev->name='%s'", - rule->kernel, class_dev->name); - if (strcmp_pattern(rule->kernel, class_dev->name) != 0) { + if (rule->kernel_operation != KEY_OP_UNSET) { + dbg("check for " KEY_KERNEL " rule->kernel='%s' udev_kernel_name='%s'", + rule->kernel, udev->kernel_name); + if (strcmp_pattern(rule->kernel, udev->kernel_name) != 0) { dbg(KEY_KERNEL " is not matching"); if (rule->kernel_operation != KEY_OP_NOMATCH) goto exit; @@ -516,9 +504,9 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, dbg(KEY_KERNEL " key is true"); } - if (rule->subsystem[0] != '\0') { - dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' class_dev->name='%s'", - rule->subsystem, class_dev->name); + if (rule->subsystem_operation != KEY_OP_UNSET) { + dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' udev->subsystem='%s'", + rule->subsystem, udev->subsystem); if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) { dbg(KEY_SUBSYSTEM " is not matching"); if (rule->subsystem_operation != KEY_OP_NOMATCH) @@ -561,14 +549,14 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, /* walk up the chain of physical devices and find a match */ while (1) { /* check for matching driver */ - if (rule->driver[0] != '\0') { - if (sysfs_device == NULL) { + if (rule->driver_operation != KEY_OP_UNSET) { + if (parent_device == NULL) { dbg("device has no sysfs_device"); goto exit; } dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'", - rule->driver, sysfs_device->driver_name); - if (strcmp_pattern(rule->driver, sysfs_device->driver_name) != 0) { + rule->driver, parent_device->driver_name); + if (strcmp_pattern(rule->driver, parent_device->driver_name) != 0) { dbg(KEY_DRIVER " is not matching"); if (rule->driver_operation != KEY_OP_NOMATCH) goto try_parent; @@ -581,14 +569,14 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, } /* check for matching bus value */ - if (rule->bus[0] != '\0') { - if (sysfs_device == NULL) { + if (rule->bus_operation != KEY_OP_UNSET) { + if (parent_device == NULL) { dbg("device has no sysfs_device"); goto exit; } dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'", - rule->bus, sysfs_device->bus); - if (strcmp_pattern(rule->bus, sysfs_device->bus) != 0) { + rule->bus, parent_device->bus); + if (strcmp_pattern(rule->bus, parent_device->bus) != 0) { dbg(KEY_BUS " is not matching"); if (rule->bus_operation != KEY_OP_NOMATCH) goto try_parent; @@ -601,13 +589,13 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, } /* check for matching bus id */ - if (rule->id[0] != '\0') { - if (sysfs_device == NULL) { + if (rule->id_operation != KEY_OP_UNSET) { + if (parent_device == NULL) { dbg("device has no sysfs_device"); goto exit; } dbg("check " KEY_ID); - if (strcmp_pattern(rule->id, sysfs_device->bus_id) != 0) { + if (strcmp_pattern(rule->id, parent_device->bus_id) != 0) { dbg(KEY_ID " is not matching"); if (rule->id_operation != KEY_OP_NOMATCH) goto try_parent; @@ -626,9 +614,24 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, dbg("check " KEY_SYSFS " pairs"); for (i = 0; i < rule->sysfs_pair_count; i++) { struct key_pair *pair; + char value[VALUE_SIZE]; + size_t len; pair = &rule->sysfs_pair[i]; - if (compare_sysfs_attribute(class_dev, sysfs_device, pair) != 0) { + if (find_sysfs_attribute(class_dev, parent_device, pair->name, value, sizeof(value)) != 0) + goto try_parent; + + /* strip trailing whitespace of value, if not asked to match for it */ + len = strlen(pair->value); + if (len && !isspace(pair->value[len-1])) { + len = strlen(value); + while (len > 0 && isspace(value[len-1])) + value[--len] = '\0'; + dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-len, value); + } + + dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value); + if (strcmp_pattern(pair->value, value) != 0) { dbg(KEY_SYSFS "{'%s'} is not matching", pair->name); if (pair->operation != KEY_OP_NOMATCH) goto try_parent; @@ -645,21 +648,22 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule, break; try_parent: dbg("try parent sysfs device"); - sysfs_device = sysfs_get_device_parent(sysfs_device); - if (sysfs_device == NULL) + parent_device = sysfs_get_device_parent(parent_device); + if (parent_device == NULL) goto exit; - dbg("look at sysfs_device->path='%s'", sysfs_device->path); - dbg("look at sysfs_device->bus_id='%s'", sysfs_device->bus_id); + dbg("look at sysfs_device->path='%s'", parent_device->path); + dbg("look at sysfs_device->bus_id='%s'", parent_device->bus_id); } /* execute external program */ - if (rule->program[0] != '\0') { + if (rule->program_operation != KEY_OP_UNSET) { char program[PATH_SIZE]; dbg("check " KEY_PROGRAM); strlcpy(program, rule->program, sizeof(program)); apply_format(udev, program, sizeof(program), class_dev, sysfs_device); - if (execute_program(udev, program, udev->program_result, sizeof(udev->program_result)) != 0) { + if (execute_program_pipe(program, udev->subsystem, + udev->program_result, sizeof(udev->program_result)) != 0) { dbg(KEY_PROGRAM " returned nonzero"); if (rule->program_operation != KEY_OP_NOMATCH) goto exit; @@ -672,7 +676,7 @@ try_parent: } /* check for matching result of external program */ - if (rule->result[0] != '\0') { + if (rule->result_operation != KEY_OP_UNSET) { dbg("check for " KEY_RESULT " rule->result='%s', udev->program_result='%s'", rule->result, udev->program_result); if (strcmp_pattern(rule->result, udev->program_result) != 0) { @@ -727,12 +731,17 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d list_for_each_entry(rule, &udev_rule_list, node) { dbg("process rule"); if (match_rule(udev, rule, class_dev, sysfs_device) == 0) { + if (udev->name[0] != '\0' && rule->name[0] != '\0') { + dbg("node name already set, rule ignored"); + continue; + } /* apply options */ if (rule->ignore_device) { info("configured rule in '%s[%i]' applied, '%s' is ignored", rule->config_file, rule->config_line, udev->kernel_name); - return -1; + udev->ignore_device = 1; + return 0; } if (rule->ignore_remove) { udev->ignore_remove = 1; @@ -775,16 +784,16 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d next = strchr(temp, ' '); while (next) { next[0] = '\0'; - dbg("add symlink '%s'", pos); + info("add symlink '%s'", pos); name_list_add(&udev->symlink_list, pos, 0); pos = &next[1]; next = strchr(pos, ' '); } - dbg("add symlink '%s'", pos); + info("add symlink '%s'", pos); name_list_add(&udev->symlink_list, pos, 0); } - /* rule matches */ + /* set name, later rules with name set will be ignored */ if (rule->name[0] != '\0') { info("configured rule in '%s[%i]' applied, '%s' becomes '%s'", rule->config_file, rule->config_line, udev->kernel_name, rule->name); @@ -797,22 +806,27 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d if (udev->type != DEV_NET) dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i", udev->name, udev->owner, udev->group, udev->mode, udev->partitions); + } - break; + if (rule->run[0] != '\0') { + char program[PATH_SIZE]; + + strlcpy(program, rule->run, sizeof(program)); + apply_format(udev, program, sizeof(program), class_dev, sysfs_device); + dbg("add run '%s'", program); + name_list_add(&udev->run_list, program, 0); } if (rule->last_rule) { dbg("last rule to be applied"); break; } - } } if (udev->name[0] == '\0') { - /* no rule matched, so we use the kernel name */ strlcpy(udev->name, udev->kernel_name, sizeof(udev->name)); - dbg("no rule found, use kernel name '%s'", udev->name); + info("no rule found, use kernel name '%s'", udev->name); } if (udev->tmp_node[0] != '\0') { @@ -823,3 +837,116 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d return 0; } + +int udev_rules_get_run(struct udevice *udev) +{ + struct udev_rule *rule; + char program[PATH_SIZE]; + + /* look for a matching rule to apply */ + list_for_each_entry(rule, &udev_rule_list, node) { + dbg("process rule"); + + if (rule->run[0] == '\0') + continue; + + if (rule->name[0] != '\0' || rule->symlink[0] != '\0' || + rule->mode != 0000 || rule->owner[0] != '\0' || rule->group[0] != '\0') { + dbg("skip rule that names a device"); + continue; + } + + if (rule->action_operation != KEY_OP_UNSET) { + dbg("check for " KEY_ACTION " rule->action='%s' udev->action='%s'", + rule->action, udev->action); + if (strcmp_pattern(rule->action, udev->action) != 0) { + dbg(KEY_ACTION " is not matching"); + if (rule->action_operation != KEY_OP_NOMATCH) + continue; + } else { + dbg(KEY_ACTION " matches"); + if (rule->action_operation == KEY_OP_NOMATCH) + continue; + } + dbg(KEY_ACTION " key is true"); + } + + if (rule->kernel_operation != KEY_OP_UNSET) { + dbg("check for " KEY_KERNEL " rule->kernel='%s' udev->kernel_name='%s'", + rule->kernel, udev->kernel_name); + if (strcmp_pattern(rule->kernel, udev->kernel_name) != 0) { + dbg(KEY_KERNEL " is not matching"); + if (rule->kernel_operation != KEY_OP_NOMATCH) + continue; + } else { + dbg(KEY_KERNEL " matches"); + if (rule->kernel_operation == KEY_OP_NOMATCH) + continue; + } + dbg(KEY_KERNEL " key is true"); + } + + if (rule->subsystem_operation != KEY_OP_UNSET) { + dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' udev->subsystem='%s'", + rule->subsystem, udev->subsystem); + if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) { + dbg(KEY_SUBSYSTEM " is not matching"); + if (rule->subsystem_operation != KEY_OP_NOMATCH) + continue; + } else { + dbg(KEY_SUBSYSTEM " matches"); + if (rule->subsystem_operation == KEY_OP_NOMATCH) + continue; + } + dbg(KEY_SUBSYSTEM " key is true"); + } + + if (rule->env_pair_count) { + int i; + + dbg("check for " KEY_ENV " pairs"); + for (i = 0; i < rule->env_pair_count; i++) { + struct key_pair *pair; + const char *value; + + pair = &rule->env_pair[i]; + value = getenv(pair->name); + if (!value) { + dbg(KEY_ENV "{'%s'} is not found", pair->name); + continue; + } + if (strcmp_pattern(pair->value, value) != 0) { + dbg(KEY_ENV "{'%s'} is not matching", pair->name); + if (pair->operation != KEY_OP_NOMATCH) + continue; + } else { + dbg(KEY_ENV "{'%s'} matches", pair->name); + if (pair->operation == KEY_OP_NOMATCH) + continue; + } + } + dbg(KEY_ENV " key is true"); + } + + /* rule matches */ + + if (rule->ignore_device) { + info("configured rule in '%s[%i]' applied, '%s' is ignored", + rule->config_file, rule->config_line, udev->kernel_name); + udev->ignore_device = 1; + return 0; + } + + strlcpy(program, rule->run, sizeof(program)); + apply_format(udev, program, sizeof(program), NULL, NULL); + dbg("add run '%s'", program); + name_list_add(&udev->run_list, program, 0); + + if (rule->last_rule) { + dbg("last rule to be applied"); + break; + } + } + + return 0; +}