chiark / gitweb /
store the imported device information in the udevdb
[elogind.git] / udev_rules.c
index 2581dc2a78decf91901399653a29ea76d967aa5a..9b9454e8fbcd53f8b0654975bb8b8c598c327dbd 100644 (file)
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
@@ -136,11 +135,153 @@ static int get_format_len(char **str)
        return -1;
 }
 
-/** Finds the lowest positive N such that <name>N isn't present in 
- *  $(udevroot) either as a file or a symlink.
- *
- *  @param  name                Name to check for
- *  @return                     0 if <name> didn't exist and N otherwise.
+static int get_key(char **line, char **key, char **value)
+{
+       char *linepos;
+       char *temp;
+
+       linepos = *line;
+       if (!linepos)
+               return -1;
+
+       if (strchr(linepos, '\\')) {
+               dbg("escaped characters are not supported, skip");
+               return -1;
+       }
+
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
+
+       /* get the key */
+       *key = linepos;
+       while (1) {
+               linepos++;
+               if (linepos[0] == '\0')
+                       return -1;
+               if (isspace(linepos[0]))
+                       break;
+               if (linepos[0] == '=')
+                       break;
+       }
+
+       /* terminate key */
+       linepos[0] = '\0';
+       linepos++;
+
+       /* skip whitespace */
+       while (isspace(linepos[0]))
+               linepos++;
+
+       /* get the value*/
+       if (linepos[0] == '"') {
+               linepos++;
+               temp = strchr(linepos, '"');
+               if (!temp) {
+                       dbg("missing closing quote");
+                       return -1;
+               }
+               dbg("value is quoted");
+               temp[0] = '\0';
+       } else if (linepos[0] == '\'') {
+               linepos++;
+               temp = strchr(linepos, '\'');
+               if (!temp) {
+                       dbg("missing closing quote");
+                       return -1;
+               }
+               dbg("value is quoted");
+               temp[0] = '\0';
+       } else if (linepos[0] == '\0') {
+               dbg("value is empty");
+       } else {
+               temp = linepos;
+               while (temp[0] && !isspace(temp[0]))
+                       temp++;
+               temp[0] = '\0';
+       }
+       *value = linepos;
+
+       return 0;
+}
+
+static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
+{
+       char line[LINE_SIZE];
+       const char *bufline;
+       char *linepos;
+       char *variable;
+       char *value;
+       size_t cur;
+       size_t count;
+       int lineno;
+
+       /* loop through the whole buffer */
+       lineno = 0;
+       cur = 0;
+       while (cur < bufsize) {
+               count = buf_get_line(buf, bufsize, cur);
+               bufline = &buf[cur];
+               cur += count+1;
+               lineno++;
+
+               if (count >= sizeof(line)) {
+                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+                       continue;
+               }
+
+               /* eat the whitespace */
+               while ((count > 0) && isspace(bufline[0])) {
+                       bufline++;
+                       count--;
+               }
+               if (count == 0)
+                       continue;
+
+               /* see if this is a comment */
+               if (bufline[0] == COMMENT_CHARACTER)
+                       continue;
+
+               strlcpy(line, bufline, count+1);
+
+               linepos = line;
+               if (get_key(&linepos, &variable, &value) == 0) {
+                       dbg("import '%s=%s'", variable, value);
+                       name_list_key_add(&udev->env_list, variable, value);
+                       setenv(variable, value, 1);
+               }
+       }
+
+       return 0;
+}
+
+static int import_file_into_env(struct udevice *udev, const char *filename)
+{
+       char *buf;
+       size_t bufsize;
+
+       if (file_map(filename, &buf, &bufsize) != 0) {
+               err("can't open '%s'", filename);
+               return -1;
+       }
+       import_keys_into_env(udev, buf, bufsize);
+       file_unmap(buf, bufsize);
+
+       return 0;
+}
+
+static int import_program_into_env(struct udevice *udev, const char *program)
+{
+       char result[1024];
+       size_t reslen;
+
+       if (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 0)
+               return -1;
+       return import_keys_into_env(udev, result, reslen);
+}
+
+/* finds the lowest positive N such that <name>N isn't present in the udevdb
+ * if <name> doesn't exist, 0 is returned, N otherwise
  */
 static int find_free_number(struct udevice *udev, const char *name)
 {
@@ -173,16 +314,17 @@ static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sys
 
        dbg("look for device attribute '%s'", name);
        if (class_dev) {
+               dbg("look for class attribute '%s/%s'", class_dev->path, name);
                tmpattr = sysfs_get_classdev_attr(class_dev, name);
                if (tmpattr)
                        goto attr_found;
        }
        if (sysfs_device) {
+               dbg("look for devices attribute '%s/%s'", sysfs_device->path, name);
                tmpattr = sysfs_get_device_attr(sysfs_device, name);
                if (tmpattr)
                        goto attr_found;
        }
-
        return -1;
 
 attr_found:
@@ -198,56 +340,135 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 {
        char temp[PATH_SIZE];
        char temp2[PATH_SIZE];
-       char *tail, *pos, *cpos, *attr, *rest;
+       char *head, *tail, *pos, *cpos, *attr, *rest;
        int len;
        int i;
-       char c;
        unsigned int next_free_number;
        struct sysfs_class_device *class_dev_parent;
-
-       pos = string;
+       enum subst_type {
+               SUBST_UNKNOWN,
+               SUBST_DEVPATH,
+               SUBST_ID,
+               SUBST_KERNEL_NUMBER,
+               SUBST_KERNEL_NAME,
+               SUBST_MAJOR,
+               SUBST_MINOR,
+               SUBST_RESULT,
+               SUBST_SYSFS,
+               SUBST_ENUM,
+               SUBST_PARENT,
+               SUBST_TEMP_NODE,
+               SUBST_ROOT,
+               SUBST_MODALIAS,
+               SUBST_ENV,
+       };
+       static const struct subst_map {
+               char *name;
+               char fmt;
+               enum subst_type type;
+       } map[] = {
+               { .name = "devpath",            .fmt = 'p',     .type = SUBST_DEVPATH },
+               { .name = "id",                 .fmt = 'b',     .type = SUBST_ID },
+               { .name = "number",             .fmt = 'n',     .type = SUBST_KERNEL_NUMBER },
+               { .name = "kernel",             .fmt = 'k',     .type = SUBST_KERNEL_NAME },
+               { .name = "major",              .fmt = 'M',     .type = SUBST_MAJOR },
+               { .name = "minor",              .fmt = 'm',     .type = SUBST_MINOR },
+               { .name = "result",             .fmt = 'c',     .type = SUBST_RESULT },
+               { .name = "sysfs",              .fmt = 's',     .type = SUBST_SYSFS },
+               { .name = "enum",               .fmt = 'e',     .type = SUBST_ENUM },
+               { .name = "parent",             .fmt = 'P',     .type = SUBST_PARENT },
+               { .name = "tempnode",           .fmt = 'N',     .type = SUBST_TEMP_NODE },
+               { .name = "root",               .fmt = 'r',     .type = SUBST_ROOT },
+               { .name = "modalias",           .fmt = 'A',     .type = SUBST_MODALIAS },
+               { .name = "env",                .fmt = 'E',     .type = SUBST_ENV },
+               {}
+       };
+       enum subst_type type;
+       const struct subst_map *subst;
+
+       head = string;
        while (1) {
-               pos = strchr(pos, '%');
-               if (pos == NULL)
-                       break;
-
-               pos[0] = '\0';
-               tail = pos+1;
-               len = get_format_len(&tail);
-               c = tail[0];
-               strlcpy(temp, tail+1, sizeof(temp));
-               tail = temp;
-               dbg("format=%c, string='%s', tail='%s'",c , string, tail);
+               len = -1;
+               while (head[0] != '\0') {
+                       if (head[0] == '$') {
+                               /* substitute named variable */
+                               if (head[1] == '\0')
+                                       break;
+                               if (head[1] == '$') {
+                                       strlcpy(temp, head+2, sizeof(temp));
+                                       strlcpy(head+1, temp, maxsize);
+                                       head++;
+                                       continue;
+                               }
+                               head[0] = '\0';
+                               for (subst = map; subst->name; subst++) {
+                                       if (strncasecmp(&head[1], subst->name, strlen(subst->name)) == 0) {
+                                               type = subst->type;
+                                               tail = head + strlen(subst->name)+1;
+                                               dbg("will substitute format name '%s'", subst->name);
+                                               goto found;
+                                       }
+                               }
+                       }
+                       else if (head[0] == '%') {
+                               /* substitute format char */
+                               if (head[1] == '\0')
+                                       break;
+                               if (head[1] == '%') {
+                                       strlcpy(temp, head+2, sizeof(temp));
+                                       strlcpy(head+1, temp, maxsize);
+                                       head++;
+                                       continue;
+                               }
+                               head[0] = '\0';
+                               tail = head+1;
+                               len = get_format_len(&tail);
+                               for (subst = map; subst->name; subst++) {
+                                       if (tail[0] == subst->fmt) {
+                                               type = subst->type;
+                                               tail++;
+                                               dbg("will substitute format char '%c'", subst->fmt);
+                                               goto found;
+                                       }
+                               }
+                       }
+                       head++;
+               }
+               break;
+found:
                attr = get_format_attribute(&tail);
+               strlcpy(temp, tail, sizeof(temp));
+               dbg("format=%i, string='%s', tail='%s', class_dev=%p, sysfs_dev=%p",
+                   type ,string, tail, class_dev, sysfs_device);
 
-               switch (c) {
-               case 'p':
+               switch (type) {
+               case SUBST_DEVPATH:
                        strlcat(string, udev->devpath, maxsize);
-                       dbg("substitute kernel name '%s'", udev->kernel_name);
+                       dbg("substitute devpath '%s'", udev->devpath);
                        break;
-               case 'b':
+               case SUBST_ID:
                        strlcat(string, udev->bus_id, maxsize);
                        dbg("substitute bus_id '%s'", udev->bus_id);
                        break;
-               case 'k':
+               case SUBST_KERNEL_NAME:
                        strlcat(string, udev->kernel_name, maxsize);
                        dbg("substitute kernel name '%s'", udev->kernel_name);
                        break;
-               case 'n':
+               case SUBST_KERNEL_NUMBER:
                        strlcat(string, udev->kernel_number, maxsize);
                        dbg("substitute kernel number '%s'", udev->kernel_number);
-                               break;
-               case 'm':
-                       sprintf(temp2, "%d", minor(udev->devt));
-                       strlcat(string, temp2, maxsize);
-                       dbg("substitute minor number '%s'", temp2);
                        break;
-               case 'M':
+               case SUBST_MAJOR:
                        sprintf(temp2, "%d", major(udev->devt));
                        strlcat(string, temp2, maxsize);
                        dbg("substitute major number '%s'", temp2);
                        break;
-               case 'c':
+               case SUBST_MINOR:
+                       sprintf(temp2, "%d", minor(udev->devt));
+                       strlcat(string, temp2, maxsize);
+                       dbg("substitute minor number '%s'", temp2);
+                       break;
+               case SUBST_RESULT:
                        if (udev->program_result[0] == '\0')
                                break;
                        /* get part part of the result string */
@@ -281,14 +502,24 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                dbg("substitute result string '%s'", udev->program_result);
                        }
                        break;
-               case 's':
+               case SUBST_SYSFS:
                        if (attr == NULL) {
                                dbg("missing attribute");
                                break;
                        }
                        if (find_sysfs_attribute(class_dev, sysfs_device, attr, temp2, sizeof(temp2)) != 0) {
-                               dbg("sysfs attribute '%s' not found", attr);
-                               break;
+                               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;
                        }
                        /* strip trailing whitespace of sysfs value */
                        i = strlen(temp2);
@@ -298,18 +529,14 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        strlcat(string, temp2, maxsize);
                        dbg("substitute sysfs value '%s'", temp2);
                        break;
-               case '%':
-                       strlcat(string, "%", maxsize);
-                       pos++;
-                       break;
-               case 'e':
+               case SUBST_ENUM:
                        next_free_number = find_free_number(udev, string);
                        if (next_free_number > 0) {
                                sprintf(temp2, "%d", next_free_number);
                                strlcat(string, temp2, maxsize);
                        }
                        break;
-               case 'P':
+               case SUBST_PARENT:
                        if (!class_dev)
                                break;
                        class_dev_parent = sysfs_get_classdev_parent(class_dev);
@@ -317,7 +544,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 +554,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                udev_cleanup_device(&udev_parent);
                        }
                        break;
-               case 'N':
+               case SUBST_TEMP_NODE:
                        if (udev->tmp_node[0] == '\0') {
                                dbg("create temporary device node for callout");
                                snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
@@ -338,152 +565,64 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        strlcat(string, udev->tmp_node, maxsize);
                        dbg("substitute temporary device node name '%s'", udev->tmp_node);
                        break;
-               case 'r':
+               case SUBST_ROOT:
                        strlcat(string, udev_root, maxsize);
                        dbg("substitute udev_root '%s'", udev_root);
                        break;
-               default:
-                       err("unknown substitution type '%%%c'", c);
-                       break;
-               }
-               /* truncate to specified length */
-               if (len > 0)
-                       pos[len] = '\0';
-
-               strlcat(string, tail, maxsize);
-       }
-}
-
-static int execute_program(struct udevice *udev, const char *path, char *value, int len)
-{
-       int retval;
-       int count;
-       int status;
-       int fds[2];
-       pid_t pid;
-       char *pos;
-       char arg[PATH_SIZE];
-       char *argv[(sizeof(arg) / 2) + 1];
-       int i;
-
-       strlcpy(arg, path, sizeof(arg));
-       i = 0;
-       if (strchr(path, ' ')) {
-               pos = arg;
-               while (pos != NULL) {
-                       if (pos[0] == '\'') {
-                               /* don't separate if in apostrophes */
-                               pos++;
-                               argv[i] = strsep(&pos, "\'");
-                               while (pos && pos[0] == ' ')
-                                       pos++;
-                       } else {
-                               argv[i] = strsep(&pos, " ");
-                       }
-                       dbg("arg[%i] '%s'", i, argv[i]);
-                       i++;
-               }
-               argv[i] =  NULL;
-               dbg("execute '%s' with parsed arguments", arg);
-       } else {
-               argv[0] = arg;
-               argv[1] = udev->subsystem;
-               argv[2] = NULL;
-               dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
-       }
-
-       retval = pipe(fds);
-       if (retval != 0) {
-               err("pipe failed");
-               return -1;
-       }
-
-       pid = fork();
-       switch(pid) {
-       case 0:
-               /* child dup2 write side of pipe to STDOUT */
-               dup2(fds[1], STDOUT_FILENO);
-               retval = execv(arg, argv);
-
-               info(KEY_PROGRAM " execution of '%s' failed", path);
-               exit(1);
-       case -1:
-               err("fork of '%s' failed", path);
-               return -1;
-       default:
-               /* parent reads from fds[0] */
-               close(fds[1]);
-               retval = 0;
-               i = 0;
-               while (1) {
-                       count = read(fds[0], value + i, len - i-1);
-                       if (count < 0) {
-                               err("read failed with '%s'", strerror(errno));
-                               retval = -1;
-                       }
-
-                       if (count == 0)
+               case SUBST_MODALIAS:
+                       if (find_sysfs_attribute(NULL, sysfs_device, "modalias", temp2, sizeof(temp2)) != 0)
                                break;
-
-                       i += count;
-                       if (i >= len-1) {
-                               err("result len %d too short", len);
-                               retval = -1;
+                       strlcat(string, temp2, maxsize);
+                       dbg("substitute MODALIAS '%s'", temp2);
+                       break;
+               case SUBST_ENV:
+                       if (attr == NULL) {
+                               dbg("missing attribute");
                                break;
                        }
+                       pos = getenv(attr);
+                       if (pos == NULL)
+                               break;
+                       strlcat(string, pos, maxsize);
+                       dbg("substitute env '%s=%s'", attr, pos);
+                       break;
+               default:
+                       err("unknown substitution type=%i", type);
+                       break;
                }
-               value[i] = '\0';
-
-               close(fds[0]);
-               waitpid(pid, &status, 0);
-
-               if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-                       dbg("exec program status 0x%x", status);
-                       retval = -1;
+               /* possibly truncate to format-char specified length */
+               if (len != -1) {
+                       head[len] = '\0';
+                       dbg("truncate to %i chars, subtitution string becomes '%s'", len, head);
                }
+               strlcat(string, temp, maxsize);
        }
-
-       if (!retval) {
-               remove_trailing_char(value, '\n');
-               dbg("result is '%s'", value);
-               replace_untrusted_chars(value);
-       } else
-               value[0] = '\0';
-
-       return retval;
-}
-
-static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct key_pair *pair)
-{
-       char value[VALUE_SIZE];
-       int i;
-
-       if (find_sysfs_attribute(class_dev, sysfs_device, pair->name, value, sizeof(value)) != 0)
-               return -1;
-
-       /* strip trailing whitespace of value, if not asked to match for it */
-       if (!isspace(pair->value[strlen(pair->value)-1])) {
-               i = strlen(value);
-               while (i > 0 && isspace(value[i-1]))
-                       value[--i] = '\0';
-               dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-i, value);
-       }
-
-       dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
-       if (strcmp_pattern(pair->value, value) != 0)
-               return -1;
-
-       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) {
+       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");
+       }
+
+       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;
@@ -495,9 +634,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)
@@ -510,6 +649,42 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
                dbg(KEY_SUBSYSTEM " key is true");
        }
 
+       if (rule->devpath_operation != KEY_OP_UNSET) {
+               dbg("check for " KEY_DEVPATH " rule->devpath='%s' udev->devpath='%s'",
+                   rule->devpath, udev->devpath);
+               if (strcmp_pattern(rule->devpath, udev->devpath) != 0) {
+                       dbg(KEY_DEVPATH " is not matching");
+                       if (rule->devpath_operation != KEY_OP_NOMATCH)
+                               goto exit;
+               } else {
+                       dbg(KEY_DEVPATH " matches");
+                       if (rule->devpath_operation == KEY_OP_NOMATCH)
+                               goto exit;
+               }
+               dbg(KEY_DEVPATH " key is true");
+       }
+
+       if (rule->modalias_operation != KEY_OP_UNSET) {
+               char value[NAME_SIZE];
+
+               if (find_sysfs_attribute(NULL, sysfs_device, "modalias", value, sizeof(value)) != 0) {
+                       dbg(KEY_MODALIAS " value not found");
+                       goto exit;
+               }
+               dbg("check for " KEY_MODALIAS " rule->modalias='%s' modalias='%s'",
+                   rule->modalias, value);
+               if (strcmp_pattern(rule->modalias, value) != 0) {
+                       dbg(KEY_MODALIAS " is not matching");
+                       if (rule->modalias_operation != KEY_OP_NOMATCH)
+                               goto exit;
+               } else {
+                       dbg(KEY_MODALIAS " matches");
+                       if (rule->modalias_operation == KEY_OP_NOMATCH)
+                               goto exit;
+               }
+               dbg(KEY_MODALIAS " key is true");
+       }
+
        if (rule->env_pair_count) {
                int i;
 
@@ -540,14 +715,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;
@@ -560,14 +735,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;
@@ -580,13 +755,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;
@@ -605,9 +780,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;
@@ -624,25 +814,55 @@ 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);
+       }
+
+       /* import variables from file into environment */
+       if (rule->import_operation != KEY_OP_UNSET) {
+               char import[PATH_SIZE];
+               int rc = -1;
+
+               strlcpy(import, rule->import, sizeof(import));
+               apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
+               dbg("check for " KEY_IMPORT " import='%s'", import);
+               if (rule->import_exec) {
+                       dbg("run executable file import='%s'", import);
+                       rc = import_program_into_env(udev, import);
+               } else {
+                       dbg("import file import='%s'", import);
+                       rc = import_file_into_env(udev, import);
+               }
+               if (rc) {
+                       dbg(KEY_IMPORT " failed");
+                       if (rule->import_operation != KEY_OP_NOMATCH)
+                               goto exit;
+               } else
+                       dbg(KEY_IMPORT " '%s' imported", rule->import);
+               dbg(KEY_IMPORT " key is true");
        }
 
        /* execute external program */
-       if (rule->program[0] != '\0') {
+       if (rule->program_operation != KEY_OP_UNSET) {
                char program[PATH_SIZE];
+               char result[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) {
-                       dbg(KEY_PROGRAM " returned nonzero");
+               dbg("check for " KEY_PROGRAM " program='%s", program);
+               if (execute_program(program, udev->subsystem, result, sizeof(result), NULL) != 0) {
+                       dbg(KEY_PROGRAM " is not matching");
                        if (rule->program_operation != KEY_OP_NOMATCH)
                                goto exit;
                } else {
+                       dbg(KEY_PROGRAM " matches");
+                       remove_trailing_char(result, '\n');
+                       replace_untrusted_chars(result);
+                       dbg("result is '%s'", result);
+                       strlcpy(udev->program_result, result, sizeof(udev->program_result));
                        dbg(KEY_PROGRAM " returned successful");
                        if (rule->program_operation == KEY_OP_NOMATCH)
                                goto exit;
@@ -651,7 +871,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) {
@@ -703,15 +923,25 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
        dbg("udev->kernel_name='%s'", udev->kernel_name);
 
        /* look for a matching rule to apply */
-       list_for_each_entry(rule, &udev_rule_list, node) {
+       udev_rules_iter_init();
+       while (1) {
+               rule = udev_rules_iter_next();
+               if (rule == NULL)
+                       break;
+
+               if (udev->name_set && rule->name_operation != KEY_OP_UNSET) {
+                       dbg("node name already set, rule ignored");
+                       continue;
+               }
+
                dbg("process rule");
                if (match_rule(udev, rule, class_dev, sysfs_device) == 0) {
-
                        /* 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;
@@ -724,72 +954,116 @@ int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_d
                        }
 
                        /* apply permissions */
-                       if (rule->mode != 0000) {
+                       if (!udev->mode_final && rule->mode != 0000) {
+                               if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
+                                       udev->mode_final = 1;
                                udev->mode = rule->mode;
                                dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
                        }
-                       if (rule->owner[0] != '\0') {
+                       if (!udev->owner_final && rule->owner[0] != '\0') {
+                               if (rule->owner_operation == KEY_OP_ASSIGN_FINAL)
+                                       udev->owner_final = 1;
                                strlcpy(udev->owner, rule->owner, sizeof(udev->owner));
                                apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
                                dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
                        }
-                       if (rule->group[0] != '\0') {
+                       if (!udev->group_final && rule->group[0] != '\0') {
+                               if (rule->group_operation == KEY_OP_ASSIGN_FINAL)
+                                       udev->group_final = 1;
                                strlcpy(udev->group, rule->group, sizeof(udev->group));
                                apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
                                dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
                        }
 
                        /* collect symlinks */
-                       if (rule->symlink[0] != '\0') {
+                       if (!udev->symlink_final && rule->symlink_operation != KEY_OP_UNSET) {
                                char temp[PATH_SIZE];
                                char *pos, *next;
 
-                               info("configured rule in '%s[%i]' applied, added symlink '%s'",
-                                    rule->config_file, rule->config_line, rule->symlink);
-                               strlcpy(temp, rule->symlink, sizeof(temp));
-                               apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
-
-                               /* add multiple symlinks separated by spaces */
-                               pos = temp;
-                               next = strchr(temp, ' ');
-                               while (next) {
-                                       next[0] = '\0';
+                               if (rule->symlink_operation == KEY_OP_ASSIGN_FINAL)
+                                       udev->symlink_final = 1;
+                               if (rule->symlink_operation == KEY_OP_ASSIGN || rule->symlink_operation == KEY_OP_ASSIGN_FINAL) {
+                                       struct name_entry *name_loop;
+                                       struct name_entry *temp_loop;
+
+                                       info("reset symlink list");
+                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
+                                               list_del(&name_loop->node);
+                                               free(name_loop);
+                                       }
+                               }
+                               if (rule->symlink[0] != '\0') {
+                                       info("configured rule in '%s[%i]' applied, added symlink '%s'",
+                                            rule->config_file, rule->config_line, rule->symlink);
+                                       strlcpy(temp, rule->symlink, sizeof(temp));
+                                       apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
+
+                                       /* add multiple symlinks separated by spaces */
+                                       pos = temp;
+                                       next = strchr(temp, ' ');
+                                       while (next) {
+                                               next[0] = '\0';
+                                               info("add symlink '%s'", pos);
+                                               name_list_add(&udev->symlink_list, pos, 0);
+                                               pos = &next[1];
+                                               next = strchr(pos, ' ');
+                                       }
                                        info("add symlink '%s'", pos);
                                        name_list_add(&udev->symlink_list, pos, 0);
-                                       pos = &next[1];
-                                       next = strchr(pos, ' ');
                                }
-                               info("add symlink '%s'", pos);
-                               name_list_add(&udev->symlink_list, pos, 0);
                        }
 
-                       /* rule matches */
-                       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);
+                       /* set name, later rules with name set will be ignored */
+                       if (rule->name_operation != KEY_OP_UNSET) {
+                               udev->name_set = 1;
+                               if (rule->name[0] == '\0') {
+                                       info("configured rule in '%s[%i]' applied, node handling for '%s' supressed",
+                                            rule->config_file, rule->config_line, udev->kernel_name);
+                               } else {
+                                       strlcpy(udev->name, rule->name, sizeof(udev->name));
+                                       apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+                                       strlcpy(udev->config_file, rule->config_file, sizeof(udev->config_file));
+                                       udev->config_line = rule->config_line;
+
+                                       info("configured rule in '%s:%i' applied, '%s' becomes '%s'",
+                                            rule->config_file, rule->config_line, udev->kernel_name, rule->name);
+                                       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);
+                               }
+                       }
 
-                               strlcpy(udev->name, rule->name, sizeof(udev->name));
-                               apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-                               strlcpy(udev->config_file, rule->config_file, sizeof(udev->config_file));
-                               udev->config_line = rule->config_line;
+                       if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+                               char program[PATH_SIZE];
 
-                               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);
+                               if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+                                       udev->run_final = 1;
+                               if (rule->run_operation == KEY_OP_ASSIGN || rule->run_operation == KEY_OP_ASSIGN_FINAL) {
+                                       struct name_entry *name_loop;
+                                       struct name_entry *temp_loop;
 
-                               break;
+                                       info("reset run list");
+                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
+                                               list_del(&name_loop->node);
+                                               free(name_loop);
+                                       }
+                               }
+                               if (rule->run[0] != '\0') {
+                                       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));
                info("no rule found, use kernel name '%s'", udev->name);
        }
@@ -802,3 +1076,65 @@ 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 sysfs_device *sysfs_device)
+{
+       struct udev_rule *rule;
+
+       /* look for a matching rule to apply */
+       udev_rules_iter_init();
+       while (1) {
+               rule = udev_rules_iter_next();
+               if (rule == NULL)
+                       break;
+
+               dbg("process rule");
+               if (rule->run_operation == KEY_OP_UNSET)
+                       continue;
+
+               if (rule->name_operation != KEY_OP_UNSET || rule->symlink_operation != KEY_OP_UNSET ||
+                   rule->mode != 0000 || rule->owner[0] != '\0' || rule->group[0] != '\0') {
+                       dbg("skip rule that names a device");
+                       continue;
+               }
+
+               if (match_rule(udev, rule, NULL, sysfs_device) == 0) {
+                       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;
+                       }
+
+                       if (!udev->run_final && rule->run_operation != KEY_OP_UNSET) {
+                               char program[PATH_SIZE];
+
+                               if (rule->run_operation == KEY_OP_ASSIGN || rule->run_operation == KEY_OP_ASSIGN_FINAL) {
+                                       struct name_entry *name_loop;
+                                       struct name_entry *temp_loop;
+
+                                       info("reset run list");
+                                       list_for_each_entry_safe(name_loop, temp_loop, &udev->run_list, node) {
+                                               list_del(&name_loop->node);
+                                               free(name_loop);
+                                       }
+                               }
+                               if (rule->run[0] != '\0') {
+                                       strlcpy(program, rule->run, sizeof(program));
+                                       apply_format(udev, program, sizeof(program), NULL, sysfs_device);
+                                       dbg("add run '%s'", program);
+                                       name_list_add(&udev->run_list, program, 0);
+                               }
+                               if (rule->run_operation == KEY_OP_ASSIGN_FINAL)
+                                       break;
+                       }
+
+                       if (rule->last_rule) {
+                               dbg("last rule to be applied");
+                               break;
+                       }
+               }
+       }
+
+       return 0;
+}