chiark / gitweb /
allow SYMLINK== match
[elogind.git] / udev_rules.c
index 09a299f22458a6cde5f4e06fa0e5e6ad9afb2afb..daf3d7fff7992841ab766b10a0339712828dabf2 100644 (file)
@@ -1,21 +1,19 @@
 /*
- * udev_rules.c
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
  *     Free Software Foundation version 2 of the License.
- * 
+ *
  *     This program is distributed in the hope that it will be useful, but
  *     WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *     General Public License for more details.
- * 
+ *
  *     You should have received a copy of the GNU General Public License along
  *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include <unistd.h>
 #include <errno.h>
 #include <syslog.h>
+#include <fnmatch.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
 #include "udev.h"
 #include "udev_rules.h"
 
+extern char **environ;
 
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
@@ -80,68 +82,251 @@ static int get_key(char **line, char **key, char **value)
        char *temp;
 
        linepos = *line;
-       if (!linepos)
+       if (linepos == NULL)
                return -1;
 
-       if (strchr(linepos, '\\')) {
-               dbg("escaped characters are not supported, skip");
-               return -1;
-       }
-
        /* skip whitespace */
        while (isspace(linepos[0]))
                linepos++;
 
        /* get the key */
+       temp = strchr(linepos, '=');
+       if (temp == NULL || temp == linepos)
+               return -1;
+       temp[0] = '\0';
        *key = linepos;
-       while (1) {
-               linepos++;
-               if (linepos[0] == '\0')
-                       return -1;
-               if (isspace(linepos[0]))
-                       break;
-               if (linepos[0] == '=')
-                       break;
+       linepos = &temp[1];
+
+       /* get a quoted value */
+       if (linepos[0] == '"' || linepos[0] == '\'') {
+               temp = strchr(&linepos[1], linepos[0]);
+               if (temp != NULL) {
+                       temp[0] = '\0';
+                       *value = &linepos[1];
+                       goto out;
+               }
        }
 
-       /* terminate key */
-       linepos[0] = '\0';
-       linepos++;
+       /* get the value*/
+       temp = strchr(linepos, '\n');
+       if (temp != NULL)
+               temp[0] = '\0';
+       *value = linepos;
+out:
+       return 0;
+}
 
-       /* skip whitespace */
-       while (isspace(linepos[0]))
-               linepos++;
+static int run_program(const char *command, const char *subsystem,
+               char *result, size_t ressize, size_t *reslen)
+{
+       int status;
+       int outpipe[2] = {-1, -1};
+       int errpipe[2] = {-1, -1};
+       pid_t pid;
+       char arg[PATH_SIZE];
+       char program[PATH_SIZE];
+       char *argv[(sizeof(arg) / 2) + 1];
+       int devnull;
+       int i;
+       int retval = 0;
+
+       /* build argv from comand */
+       strlcpy(arg, command, sizeof(arg));
+       i = 0;
+       if (strchr(arg, ' ') != NULL) {
+               char *pos = arg;
+
+               while (pos != NULL) {
+                       if (pos[0] == '\'') {
+                               /* don't separate if in apostrophes */
+                               pos++;
+                               argv[i] = strsep(&pos, "\'");
+                               while (pos != NULL && pos[0] == ' ')
+                                       pos++;
+                       } else {
+                               argv[i] = strsep(&pos, " ");
+                       }
+                       dbg("arg[%i] '%s'", i, argv[i]);
+                       i++;
+               }
+               argv[i] = NULL;
+       } else {
+               argv[0] = arg;
+               argv[1] = NULL;
+       }
+       info("'%s'", command);
 
-       /* get the value*/
-       if (linepos[0] == '"') {
-               linepos++;
-               temp = strchr(linepos, '"');
-               if (!temp) {
-                       dbg("missing closing quote");
+       /* prepare pipes from child to parent */
+       if (result != NULL || udev_log_priority >= LOG_INFO) {
+               if (pipe(outpipe) != 0) {
+                       err("pipe failed: %s", strerror(errno));
                        return -1;
                }
-               dbg("value is quoted");
-               temp[0] = '\0';
-       } else if (linepos[0] == '\'') {
-               linepos++;
-               temp = strchr(linepos, '\'');
-               if (!temp) {
-                       dbg("missing closing quote");
+       }
+       if (udev_log_priority >= LOG_INFO) {
+               if (pipe(errpipe) != 0) {
+                       err("pipe failed: %s", strerror(errno));
                        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;
+       /* allow programs in /lib/udev called without the path */
+       if (strchr(argv[0], '/') == NULL) {
+               strlcpy(program, "/lib/udev/", sizeof(program));
+               strlcat(program, argv[0], sizeof(program));
+               argv[0] = program;
+       }
+
+       pid = fork();
+       switch(pid) {
+       case 0:
+               /* child closes parent ends of pipes */
+               if (outpipe[READ_END] > 0)
+                       close(outpipe[READ_END]);
+               if (errpipe[READ_END] > 0)
+                       close(errpipe[READ_END]);
+
+               /* discard child output or connect to pipe */
+               devnull = open("/dev/null", O_RDWR);
+               if (devnull > 0) {
+                       dup2(devnull, STDIN_FILENO);
+                       if (outpipe[WRITE_END] < 0)
+                               dup2(devnull, STDOUT_FILENO);
+                       if (errpipe[WRITE_END] < 0)
+                               dup2(devnull, STDERR_FILENO);
+                       close(devnull);
+               } else
+                       err("open /dev/null failed: %s", strerror(errno));
+               if (outpipe[WRITE_END] > 0) {
+                       dup2(outpipe[WRITE_END], STDOUT_FILENO);
+                       close(outpipe[WRITE_END]);
+               }
+               if (errpipe[WRITE_END] > 0) {
+                       dup2(errpipe[WRITE_END], STDERR_FILENO);
+                       close(errpipe[WRITE_END]);
+               }
+               execv(argv[0], argv);
+               if (errno == ENOENT || errno == ENOTDIR) {
+                       /* may be on a filesytem which is not mounted right now */
+                       info("program '%s' not found", argv[0]);
+               } else {
+                       /* other problems */
+                       err("exec of program '%s' failed", argv[0]);
+               }
+               _exit(1);
+       case -1:
+               err("fork of '%s' failed: %s", argv[0], strerror(errno));
+               return -1;
+       default:
+               /* read from child if requested */
+               if (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+                       ssize_t count;
+                       size_t respos = 0;
+
+                       /* parent closes child ends of pipes */
+                       if (outpipe[WRITE_END] > 0)
+                               close(outpipe[WRITE_END]);
+                       if (errpipe[WRITE_END] > 0)
+                               close(errpipe[WRITE_END]);
+
+                       /* read child output */
+                       while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
+                               int fdcount;
+                               fd_set readfds;
+
+                               FD_ZERO(&readfds);
+                               if (outpipe[READ_END] > 0)
+                                       FD_SET(outpipe[READ_END], &readfds);
+                               if (errpipe[READ_END] > 0)
+                                       FD_SET(errpipe[READ_END], &readfds);
+                               fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
+                               if (fdcount < 0) {
+                                       if (errno == EINTR)
+                                               continue;
+                                       retval = -1;
+                                       break;
+                               }
+
+                               /* get stdout */
+                               if (outpipe[READ_END] > 0 && FD_ISSET(outpipe[READ_END], &readfds)) {
+                                       char inbuf[1024];
+                                       char *pos;
+                                       char *line;
+
+                                       count = read(outpipe[READ_END], inbuf, sizeof(inbuf)-1);
+                                       if (count <= 0) {
+                                               close(outpipe[READ_END]);
+                                               outpipe[READ_END] = -1;
+                                               if (count < 0) {
+                                                       err("stdin read failed: %s", strerror(errno));
+                                                       retval = -1;
+                                               }
+                                               continue;
+                                       }
+                                       inbuf[count] = '\0';
+
+                                       /* store result for rule processing */
+                                       if (result) {
+                                               if (respos + count < ressize) {
+                                                       memcpy(&result[respos], inbuf, count);
+                                                       respos += count;
+                                               } else {
+                                                       err("ressize %ld too short", (long)ressize);
+                                                       retval = -1;
+                                               }
+                                       }
+                                       pos = inbuf;
+                                       while ((line = strsep(&pos, "\n")))
+                                               if (pos || line[0] != '\0')
+                                                       info("'%s' (stdout) '%s'", argv[0], line);
+                               }
+
+                               /* get stderr */
+                               if (errpipe[READ_END] > 0 && FD_ISSET(errpipe[READ_END], &readfds)) {
+                                       char errbuf[1024];
+                                       char *pos;
+                                       char *line;
+
+                                       count = read(errpipe[READ_END], errbuf, sizeof(errbuf)-1);
+                                       if (count <= 0) {
+                                               close(errpipe[READ_END]);
+                                               errpipe[READ_END] = -1;
+                                               if (count < 0)
+                                                       err("stderr read failed: %s", strerror(errno));
+                                               continue;
+                                       }
+                                       errbuf[count] = '\0';
+                                       pos = errbuf;
+                                       while ((line = strsep(&pos, "\n")))
+                                               if (pos || line[0] != '\0')
+                                                       info("'%s' (stderr) '%s'", argv[0], line);
+                               }
+                       }
+                       if (outpipe[READ_END] > 0)
+                               close(outpipe[READ_END]);
+                       if (errpipe[READ_END] > 0)
+                               close(errpipe[READ_END]);
+
+                       /* return the childs stdout string */
+                       if (result) {
+                               result[respos] = '\0';
+                               dbg("result='%s'", result);
+                               if (reslen)
+                                       *reslen = respos;
+                       }
+               }
+               waitpid(pid, &status, 0);
+               if (WIFEXITED(status)) {
+                       info("'%s' returned with status %i", argv[0], WEXITSTATUS(status));
+                       if (WEXITSTATUS(status) != 0)
+                               retval = -1;
+               } else {
+                       err("'%s' abnormal exit", argv[0]);
+                       retval = -1;
+               }
+       }
+
+       return retval;
 }
 
 static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
@@ -187,7 +372,13 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                linepos = line;
                if (get_key(&linepos, &variable, &value) == 0) {
                        dbg("import '%s=%s'", variable, value);
-                       name_list_key_add(&udev->env_list, variable, value);
+
+                       /* handle device, renamed by external tool, returning new path */
+                       if (strcmp(variable, "DEVPATH") == 0) {
+                               info("updating devpath from '%s' to '%s'", udev->dev->devpath, value);
+                               sysfs_device_set_values(udev->dev, value, NULL, NULL);
+                       } else
+                               name_list_key_add(&udev->env_list, variable, value);
                        setenv(variable, value, 1);
                }
        }
@@ -212,10 +403,10 @@ static int import_file_into_env(struct udevice *udev, const char *filename)
 
 static int import_program_into_env(struct udevice *udev, const char *program)
 {
-       char result[1024];
+       char result[2048];
        size_t reslen;
 
-       if (run_program(program, udev->dev->subsystem, result, sizeof(result), &reslen, (udev_log_priority >= LOG_INFO)) != 0)
+       if (run_program(program, udev->dev->subsystem, result, sizeof(result), &reslen) != 0)
                return -1;
        return import_keys_into_env(udev, result, reslen);
 }
@@ -231,7 +422,7 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
                struct name_entry *name_loop;
 
                dbg("found parent '%s', get the node name", dev_parent->devpath);
-               udev_parent = udev_device_init();
+               udev_parent = udev_device_init(NULL);
                if (udev_parent == NULL)
                        return -1;
                /* import the udev_db of the parent */
@@ -246,7 +437,7 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
                                if (pos) {
                                        pos[0] = '\0';
                                        pos++;
-                                       if (strcmp_pattern(filter, name) == 0) {
+                                       if (fnmatch(filter, name, 0) == 0) {
                                                dbg("import key '%s'", name_loop->name);
                                                name_list_add(&udev->env_list, name_loop->name, 0);
                                                setenv(name, pos, 1);
@@ -263,86 +454,62 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
        return rc;
 }
 
-static int match_name_and_get_number(const char *base, const char *devname)
+static int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
 {
-       size_t baselen;
-       char *endptr;
-       int num;
+       int sock;
+       struct sockaddr_un saddr;
+       socklen_t addrlen;
+       char buf[2048];
+       size_t bufpos = 0;
+       int i;
+       ssize_t count;
+       int retval = 0;
+
+       dbg("pass environment to socket '%s'", sockname);
+       sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+       memset(&saddr, 0x00, sizeof(struct sockaddr_un));
+       saddr.sun_family = AF_LOCAL;
+       /* abstract namespace only */
+       strcpy(&saddr.sun_path[1], sockname);
+       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+       bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
+       bufpos++;
+       for (i = 0; environ[i] != NULL && bufpos < sizeof(buf); i++) {
+               bufpos += strlcpy(&buf[bufpos], environ[i], sizeof(buf) - bufpos-1);
+               bufpos++;
+       }
 
-       baselen = strlen(base);
-       if (strncmp(base, devname, baselen) != 0)
-               return -1;
-       if (devname[baselen] == '\0')
-               return 0;
-       if (!isdigit(devname[baselen]))
-               return -1;
-       num = strtoul(&devname[baselen], &endptr, 10);
-       if (endptr[0] != '\0')
-               return -1;
-       return num;
+       count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+       if (count < 0)
+               retval = -1;
+       info("passed %zi bytes to socket '%s', ", count, sockname);
+
+       close(sock);
+       return retval;
 }
 
-/* finds the lowest positive device number 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(const char *base, const char *devpath)
+int udev_rules_run(struct udevice *udev)
 {
-       char db_devpath[PATH_SIZE];
-       char filename[PATH_SIZE];
-       struct udevice *udev_db;
-       int num = 0;
-       static int warn = 1;
-
-       if (warn) {
-               err("%%e is deprecated, will be removed and is unlikey to work correctly. Don't use it.");
-               warn = 0;
-       }
-
-       /* check if the device already owns a matching name */
-       udev_db = udev_device_init();
-       if (udev_db == NULL)
-               return -1;
-       if (udev_db_get_device(udev_db, devpath) == 0) {
-               struct name_entry *name_loop;
-               int devnum;
-
-               devnum = match_name_and_get_number(base, udev_db->name);
-               if (devnum >= 0) {
-                       num = devnum;
-                       dbg("device '%s', already has the node '%s' with num %u, use it", devpath, base, num);
-                       goto out;
-               }
-               list_for_each_entry(name_loop, &udev_db->symlink_list, node) {
-                       devnum = match_name_and_get_number(base, name_loop->name);
-                       if (devnum >= 0) {
-                               num = devnum;
-                               dbg("device '%s', already has a symlink '%s' with num %u, use it", devpath, base, num);
-                               goto out;
-                       }
-               }
-       }
+       struct name_entry *name_loop;
+       int retval = 0;
 
-       /* just search the database again and again until a free name is found */
-       strlcpy(filename, base, sizeof(filename));
-       while (1) {
-               dbg("look for existing node '%s'", filename);
-               if (udev_db_lookup_name(filename, db_devpath, sizeof(db_devpath)) != 0) {
-                       dbg("free num=%d", num);
-                       break;
-               }
+       dbg("executing run list");
+       list_for_each_entry(name_loop, &udev->run_list, node) {
+               if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) {
+                       pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
+               } else {
+                       char program[PATH_SIZE];
 
-               num++;
-               if (num > 100000) {
-                       err("find_free_number aborted at num=%d", num);
-                       num = -1;
-                       break;
+                       strlcpy(program, name_loop->name, sizeof(program));
+                       udev_rules_apply_format(udev, program, sizeof(program));
+                       if (run_program(program, udev->dev->subsystem, NULL, 0, NULL) != 0)
+                               if (!name_loop->ignore_error)
+                                       retval = -1;
                }
-               snprintf(filename, sizeof(filename), "%s%d", base, num);
-               filename[sizeof(filename)-1] = '\0';
        }
 
-out:
-       udev_device_cleanup(udev_db);
-       return num;
+       return retval;
 }
 
 #define WAIT_LOOP_PER_SECOND           50
@@ -366,7 +533,7 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
                        info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
                        return 0;
                }
-               /* make sure the device does not have disappeared in the meantime */
+               /* make sure, the device did not disappear in the meantime */
                if (stat(devicepath, &stats) != 0) {
                        info("device disappeared while waiting for '%s'", filepath);
                        return -2;
@@ -374,10 +541,48 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
                info("wait for '%s' for %i mseconds", filepath, 1000 / WAIT_LOOP_PER_SECOND);
                usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
        }
-       err("waiting for '%s' failed", filepath);
+       info("waiting for '%s' failed", filepath);
        return -1;
 }
 
+/* handle "[$SUBSYSTEM/$KERNEL]<attribute>" lookup */
+static int attr_get_by_subsys_id(const char *attrstr, char *devpath, size_t len, char **attr)
+{
+       char subsys[NAME_SIZE];
+       char *attrib;
+       char *id;
+       int found = 0;
+
+       if (attrstr[0] != '[')
+               goto out;
+
+       strlcpy(subsys, &attrstr[1], sizeof(subsys));
+
+       attrib = strchr(subsys, ']');
+       if (attrib == NULL)
+               goto out;
+       attrib[0] = '\0';
+       attrib = &attrib[1];
+
+       id = strchr(subsys, '/');
+       if (id == NULL)
+               goto out;
+       id[0] = '\0';
+       id = &id[1];
+
+       if (sysfs_lookup_devpath_by_subsys_id(devpath, len, subsys, id)) {
+               if (attr != NULL) {
+                       if (attrib[0] != '\0')
+                               *attr = attrib;
+                       else
+                               *attr = NULL;
+               }
+               found = 1;
+       }
+out:
+       return found;
+}
+
 void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 {
        char temp[PATH_SIZE];
@@ -386,22 +591,20 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
        int len;
        int i;
        int count;
-       unsigned int next_free_number;
        enum subst_type {
                SUBST_UNKNOWN,
                SUBST_DEVPATH,
+               SUBST_KERNEL,
                SUBST_KERNEL_NUMBER,
-               SUBST_KERNEL_NAME,
                SUBST_ID,
                SUBST_MAJOR,
                SUBST_MINOR,
                SUBST_RESULT,
-               SUBST_SYSFS,
-               SUBST_ENUM,
+               SUBST_ATTR,
                SUBST_PARENT,
                SUBST_TEMP_NODE,
                SUBST_ROOT,
-               SUBST_MODALIAS,
+               SUBST_SYS,
                SUBST_ENV,
        };
        static const struct subst_map {
@@ -409,20 +612,20 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                char fmt;
                enum subst_type type;
        } map[] = {
-               { .name = "devpath",            .fmt = 'p',     .type = SUBST_DEVPATH },
-               { .name = "number",             .fmt = 'n',     .type = SUBST_KERNEL_NUMBER },
-               { .name = "kernel",             .fmt = 'k',     .type = SUBST_KERNEL_NAME },
-               { .name = "id",                 .fmt = 'b',     .type = SUBST_ID },
-               { .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 },
+               { .name = "devpath",    .fmt = 'p',     .type = SUBST_DEVPATH },
+               { .name = "number",     .fmt = 'n',     .type = SUBST_KERNEL_NUMBER },
+               { .name = "kernel",     .fmt = 'k',     .type = SUBST_KERNEL },
+               { .name = "id",         .fmt = 'b',     .type = SUBST_ID },
+               { .name = "major",      .fmt = 'M',     .type = SUBST_MAJOR },
+               { .name = "minor",      .fmt = 'm',     .type = SUBST_MINOR },
+               { .name = "result",     .fmt = 'c',     .type = SUBST_RESULT },
+               { .name = "attr",       .fmt = 's',     .type = SUBST_ATTR },
+               { .name = "sysfs",      .fmt = 's',     .type = SUBST_ATTR },
+               { .name = "parent",     .fmt = 'P',     .type = SUBST_PARENT },
+               { .name = "tempnode",   .fmt = 'N',     .type = SUBST_TEMP_NODE },
+               { .name = "root",       .fmt = 'r',     .type = SUBST_ROOT },
+               { .name = "sys",        .fmt = 'S',     .type = SUBST_SYS },
+               { .name = "env",        .fmt = 'E',     .type = SUBST_ENV },
                { NULL, '\0', 0 }
        };
        enum subst_type type;
@@ -451,8 +654,9 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                                                goto found;
                                        }
                                }
-                       }
-                       else if (head[0] == '%') {
+                               head[0] = '$';
+                               err("unknown format variable '%s'", head);
+                       } else if (head[0] == '%') {
                                /* substitute format char */
                                if (head[1] == '\0')
                                        break;
@@ -473,6 +677,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
                                                goto found;
                                        }
                                }
+                               head[0] = '%';
+                               err("unknown format char '%c'", tail[0]);
                        }
                        head++;
                }
@@ -487,9 +693,9 @@ found:
                        strlcat(string, udev->dev->devpath, maxsize);
                        dbg("substitute devpath '%s'", udev->dev->devpath);
                        break;
-               case SUBST_KERNEL_NAME:
-                       strlcat(string, udev->dev->kernel_name, maxsize);
-                       dbg("substitute kernel name '%s'", udev->dev->kernel_name);
+               case SUBST_KERNEL:
+                       strlcat(string, udev->dev->kernel, maxsize);
+                       dbg("substitute kernel name '%s'", udev->dev->kernel);
                        break;
                case SUBST_KERNEL_NUMBER:
                        strlcat(string, udev->dev->kernel_number, maxsize);
@@ -497,8 +703,8 @@ found:
                        break;
                case SUBST_ID:
                        if (udev->dev_parent != NULL) {
-                               strlcat(string, udev->dev_parent->kernel_name, maxsize);
-                               dbg("substitute id '%s'", udev->dev_parent->kernel_name);
+                               strlcat(string, udev->dev_parent->kernel, maxsize);
+                               dbg("substitute id '%s'", udev->dev_parent->kernel);
                        }
                        break;
                case SUBST_MAJOR:
@@ -545,43 +751,57 @@ found:
                                dbg("substitute result string '%s'", udev->program_result);
                        }
                        break;
-               case SUBST_SYSFS:
-                       if (attr == NULL) {
-                               dbg("missing attribute");
-                               break;
-                       } else {
-                               struct sysfs_device *dev_parent;
-                               const char *value;
-
-                               dev_parent = udev->dev;
-                               do {
-                                       dbg("looking at '%s'", dev_parent->devpath);
-                                       value = sysfs_attr_get_value(dev_parent->devpath, attr);
-                                       if (value != NULL) {
-                                               strlcpy(temp2, value, sizeof(temp2));
+               case SUBST_ATTR:
+                       if (attr == NULL)
+                               err("missing file parameter for attr");
+                       else {
+                               char devpath[PATH_SIZE];
+                               char *attrib;
+                               const char *value = NULL;
+                               size_t size;
+
+                               if (attr_get_by_subsys_id(attr, devpath, sizeof(devpath), &attrib)) {
+                                       if (attrib != NULL)
+                                               value = sysfs_attr_get_value(devpath, attrib);
+                                       else
                                                break;
-                                       }
-                                       dev_parent = sysfs_device_get_parent(dev_parent);
-                               } while (dev_parent != NULL);
-
-                               /* strip trailing whitespace of sysfs value */
-                               i = strlen(temp2);
-                               while (i > 0 && isspace(temp2[i-1]))
-                                       temp2[--i] = '\0';
-                               count = replace_untrusted_chars(temp2);
-                               if (count)
-                                       info("%i untrusted character(s) replaced" , count);
+                               }
+
+                               /* try the current device, other matches may have selected */
+                               if (value == NULL && udev->dev_parent != NULL && udev->dev_parent != udev->dev)
+                                       value = sysfs_attr_get_value(udev->dev_parent->devpath, attr);
+
+                               /* look at all devices along the chain of parents */
+                               if (value == NULL) {
+                                       struct sysfs_device *dev_parent = udev->dev;
+
+                                       do {
+                                               dbg("looking at '%s'", dev_parent->devpath);
+                                               value = sysfs_attr_get_value(dev_parent->devpath, attr);
+                                               if (value != NULL) {
+                                                       strlcpy(temp2, value, sizeof(temp2));
+                                                       break;
+                                               }
+                                               dev_parent = sysfs_device_get_parent(dev_parent);
+                                       } while (dev_parent != NULL);
+                               }
+
+                               if (value == NULL)
+                                       break;
+
+                               /* strip trailing whitespace, and replace unwanted characters */
+                               size = strlcpy(temp2, value, sizeof(temp2));
+                               if (size >= sizeof(temp2))
+                                       size = sizeof(temp2)-1;
+                               while (size > 0 && isspace(temp2[size-1]))
+                                       temp2[--size] = '\0';
+                               count = replace_chars(temp2, ALLOWED_CHARS_INPUT);
+                               if (count > 0)
+                                       info("%i character(s) replaced" , count);
                                strlcat(string, temp2, maxsize);
                                dbg("substitute sysfs value '%s'", temp2);
                        }
                        break;
-               case SUBST_ENUM:
-                       next_free_number = find_free_number(string, udev->dev->devpath);
-                       if (next_free_number > 0) {
-                               sprintf(temp2, "%d", next_free_number);
-                               strlcat(string, temp2, maxsize);
-                       }
-                       break;
                case SUBST_PARENT:
                        {
                                struct sysfs_device *dev_parent;
@@ -591,7 +811,7 @@ found:
                                        struct udevice *udev_parent;
 
                                        dbg("found parent '%s', get the node name", dev_parent->devpath);
-                                       udev_parent = udev_device_init();
+                                       udev_parent = udev_device_init(NULL);
                                        if (udev_parent != NULL) {
                                                /* lookup the name in the udev_db with the DEVPATH of the parent */
                                                if (udev_db_get_device(udev_parent, dev_parent->devpath) == 0) {
@@ -605,7 +825,7 @@ found:
                        }
                        break;
                case SUBST_TEMP_NODE:
-                       if (udev->tmp_node[0] == '\0') {
+                       if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) {
                                dbg("create temporary device node for callout");
                                snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
                                         udev_root, major(udev->devt), minor(udev->devt));
@@ -619,23 +839,9 @@ found:
                        strlcat(string, udev_root, maxsize);
                        dbg("substitute udev_root '%s'", udev_root);
                        break;
-               case SUBST_MODALIAS:
-                       {
-                               const char *value;
-                               static int warn = 1;
-
-                               if (warn) {
-                                       err("$modalias is deprecated, use $env{MODALIAS} or "
-                                           "$sysfs{modalias} instead.");
-                                       warn = 0;
-                               }
-
-                               value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-                               if (value != NULL) {
-                                       strlcat(string, value, maxsize);
-                                       dbg("substitute MODALIAS '%s'", temp2);
-                               }
-                       }
+               case SUBST_SYS:
+                       strlcat(string, sysfs_path, maxsize);
+                       dbg("substitute sysfs_path '%s'", sysfs_path);
                        break;
                case SUBST_ENV:
                        if (attr == NULL) {
@@ -655,7 +861,7 @@ found:
                        break;
                }
                /* possibly truncate to format-char specified length */
-               if (len != -1) {
+               if (len >= 0 && len < (int)strlen(head)) {
                        head[len] = '\0';
                        dbg("truncate to %i chars, subtitution string becomes '%s'", len, head);
                }
@@ -675,17 +881,18 @@ static char *key_pair_name(struct udev_rule *rule, struct key_pair *pair)
 
 static int match_key(const char *key_name, struct udev_rule *rule, struct key *key, const char *val)
 {
-       int match;
        char value[PATH_SIZE];
        char *key_value;
        char *pos;
+       int match = 0;
 
-       if (key->operation == KEY_OP_UNSET)
+       if (key->operation != KEY_OP_MATCH &&
+           key->operation != KEY_OP_NOMATCH)
                return 0;
 
+       /* look for a matching string, parts are separated by '|' */
        strlcpy(value, rule->buf + key->val_off, sizeof(value));
        key_value = value;
-
        dbg("key %s value='%s'", key_name, key_value);
        while (key_value) {
                pos = strchr(key_value, '|');
@@ -693,19 +900,23 @@ static int match_key(const char *key_name, struct udev_rule *rule, struct key *k
                        pos[0] = '\0';
                        pos++;
                }
+
                dbg("match %s '%s' <-> '%s'", key_name, key_value, val);
-               match = (strcmp_pattern(key_value, val) == 0);
-               if (match && (key->operation != KEY_OP_NOMATCH)) {
-                       dbg("%s is true (matching value)", key_name);
-                       return 0;
-               }
-               if (!match && (key->operation == KEY_OP_NOMATCH)) {
-                       dbg("%s is true (non-matching value)", key_name);
-                       return 0;
-               }
+               match = (fnmatch(key_value, val, 0) == 0);
+               if (match)
+                       break;
+
                key_value = pos;
        }
-       dbg("%s is false", key_name);
+
+       if (match && (key->operation == KEY_OP_MATCH)) {
+               dbg("%s is true (matching value)", key_name);
+               return 0;
+       }
+       if (!match && (key->operation == KEY_OP_NOMATCH)) {
+               dbg("%s is true (non-matching value)", key_name);
+               return 0;
+       }
        return -1;
 }
 
@@ -717,7 +928,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        if (match_key("ACTION", rule, &rule->action, udev->action))
                goto nomatch;
 
-       if (match_key("KERNEL", rule, &rule->kernel_name, udev->dev->kernel_name))
+       if (match_key("KERNEL", rule, &rule->kernel, udev->dev->kernel))
                goto nomatch;
 
        if (match_key("SUBSYSTEM", rule, &rule->subsystem, udev->dev->subsystem))
@@ -726,21 +937,25 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
        if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
                goto nomatch;
 
-       if (rule->modalias.operation != KEY_OP_UNSET) {
-               const char *value;
-               static int warn = 1;
+       if (match_key("DRIVER", rule, &rule->driver, udev->dev->driver))
+               goto nomatch;
 
-               if (warn) {
-                       err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
-                       warn = 0;
-               }
+       if (match_key("NAME", rule, &rule->name, udev->name))
+               goto nomatch;
 
-               value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
-               if (value == NULL) {
-                       dbg("MODALIAS value not found");
-                       goto nomatch;
+       /* match against current list of symlinks */
+       if (rule->symlink_match.operation == KEY_OP_MATCH ||
+           rule->symlink_match.operation == KEY_OP_NOMATCH) {
+               struct name_entry *name_loop;
+               int match = 0;
+
+               list_for_each_entry(name_loop, &udev->symlink_list, node) {
+                       if (match_key("SYMLINK", rule, &rule->symlink_match, name_loop->name) == 0) {
+                               match = 1;
+                               break;
+                       }
                }
-               if (match_key("MODALIAS", rule, &rule->modalias, value))
+               if (!match)
                        goto nomatch;
        }
 
@@ -748,7 +963,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                struct key_pair *pair = &rule->env.keys[i];
 
                /* we only check for matches, assignments will be handled later */
-               if (pair->key.operation != KEY_OP_ASSIGN) {
+               if (pair->key.operation == KEY_OP_MATCH ||
+                   pair->key.operation == KEY_OP_NOMATCH) {
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = getenv(key_name);
 
@@ -761,42 +977,109 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                }
        }
 
+       if (rule->test.operation != KEY_OP_UNSET) {
+               char filename[PATH_SIZE];
+               char devpath[PATH_SIZE];
+               char *attr;
+               struct stat statbuf;
+               int match;
+
+               strlcpy(filename, key_val(rule, &rule->test), sizeof(filename));
+               udev_rules_apply_format(udev, filename, sizeof(filename));
+
+               if (attr_get_by_subsys_id(filename, devpath, sizeof(devpath), &attr)) {
+                       strlcpy(filename, sysfs_path, sizeof(filename));
+                       strlcat(filename, devpath, sizeof(filename));
+                       if (attr != NULL) {
+                               strlcat(filename, "/", sizeof(filename));
+                               strlcat(filename, attr, sizeof(filename));
+                       }
+               }
+
+               match = (stat(filename, &statbuf) == 0);
+               info("'%s' %s", filename, match ? "exists" : "does not exist");
+               if (match && rule->test_mode_mask > 0) {
+                       match = ((statbuf.st_mode & rule->test_mode_mask) > 0);
+                       info("'%s' has mode=%#o and %s %#o", filename, statbuf.st_mode,
+                            match ? "matches" : "does not match",
+                            rule->test_mode_mask);
+               }
+               if (match && rule->test.operation == KEY_OP_NOMATCH)
+                       goto nomatch;
+               if (!match && rule->test.operation == KEY_OP_MATCH)
+                       goto nomatch;
+               dbg("TEST key is true");
+       }
+
        if (rule->wait_for_sysfs.operation != KEY_OP_UNSET) {
                int found;
 
                found = (wait_for_sysfs(udev, key_val(rule, &rule->wait_for_sysfs), 3) == 0);
-               if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH)) {
-                       dbg("WAIT_FOR_SYSFS failed");
+               if (!found && (rule->wait_for_sysfs.operation != KEY_OP_NOMATCH))
                        goto nomatch;
+       }
+
+       /* check for matching sysfs attribute pairs */
+       for (i = 0; i < rule->attr.count; i++) {
+               struct key_pair *pair = &rule->attr.keys[i];
+
+               if (pair->key.operation == KEY_OP_MATCH ||
+                   pair->key.operation == KEY_OP_NOMATCH) {
+                       const char *key_name = key_pair_name(rule, pair);
+                       const char *key_value = key_val(rule, &pair->key);
+                       char devpath[PATH_SIZE];
+                       char *attrib;
+                       const char *value = NULL;
+                       char val[VALUE_SIZE];
+                       size_t len;
+
+                       if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+                               if (attrib != NULL)
+                                       value = sysfs_attr_get_value(devpath, attrib);
+                               else
+                                       goto nomatch;
+                       }
+                       if (value == NULL)
+                               value = sysfs_attr_get_value(udev->dev->devpath, key_name);
+                       if (value == NULL)
+                               goto nomatch;
+                       strlcpy(val, value, sizeof(val));
+
+                       /* strip trailing whitespace of value, if not asked to match for it */
+                       len = strlen(key_value);
+                       if (len > 0 && !isspace(key_value[len-1])) {
+                               len = strlen(val);
+                               while (len > 0 && isspace(val[len-1]))
+                                       val[--len] = '\0';
+                               dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
+                       }
+
+                       if (match_key("ATTR", rule, &pair->key, val))
+                               goto nomatch;
                }
        }
 
        /* walk up the chain of parent devices and find a match */
        udev->dev_parent = udev->dev;
        while (1) {
-               /* check for matching driver */
-               if (rule->driver.operation != KEY_OP_UNSET) {
-                       if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
-                               goto try_parent;
-               }
+               /* check for matching kernel device name */
+               if (match_key("KERNELS", rule, &rule->kernels, udev->dev_parent->kernel))
+                       goto try_parent;
 
-               /* check for matching subsystem/bus value */
-               if (rule->bus.operation != KEY_OP_UNSET) {
-                       if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
-                               goto try_parent;
-               }
+               /* check for matching subsystem value */
+               if (match_key("SUBSYSTEMS", rule, &rule->subsystems, udev->dev_parent->subsystem))
+                       goto try_parent;
 
-               /* check for matching bus id (device name) */
-               if (rule->id.operation != KEY_OP_UNSET) {
-                       if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
-                               goto try_parent;
-               }
+               /* check for matching driver */
+               if (match_key("DRIVERS", rule, &rule->drivers, udev->dev_parent->driver))
+                       goto try_parent;
 
-               /* check for matching sysfs pairs */
-               if (rule->sysfs.count) {
-                       dbg("check %i SYSFS keys", rule->sysfs.count);
-                       for (i = 0; i < rule->sysfs.count; i++) {
-                               struct key_pair *pair = &rule->sysfs.keys[i];
+               /* check for matching sysfs attribute pairs */
+               for (i = 0; i < rule->attrs.count; i++) {
+                       struct key_pair *pair = &rule->attrs.keys[i];
+
+                       if (pair->key.operation == KEY_OP_MATCH ||
+                           pair->key.operation == KEY_OP_NOMATCH) {
                                const char *key_name = key_pair_name(rule, pair);
                                const char *key_value = key_val(rule, &pair->key);
                                const char *value;
@@ -819,10 +1102,9 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                                        dbg("removed %zi trailing whitespace chars from '%s'", strlen(val)-len, val);
                                }
 
-                               if (match_key("SYSFS", rule, &pair->key, val))
+                               if (match_key("ATTRS", rule, &pair->key, val))
                                        goto try_parent;
                        }
-                       dbg("all %i SYSFS keys matched", rule->sysfs.count);
                }
 
                /* found matching device  */
@@ -834,7 +1116,7 @@ try_parent:
                if (udev->dev_parent == NULL)
                        goto nomatch;
                dbg("looking at dev_parent->devpath='%s'", udev->dev_parent->devpath);
-               dbg("looking at dev_parent->bus_kernel_name='%s'", udev->dev_parent->kernel_name);
+               dbg("looking at dev_parent->kernel='%s'", udev->dev_parent->kernel);
        }
 
        /* execute external program */
@@ -844,7 +1126,7 @@ try_parent:
 
                strlcpy(program, key_val(rule, &rule->program), sizeof(program));
                udev_rules_apply_format(udev, program, sizeof(program));
-               if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL, (udev_log_priority >= LOG_INFO)) != 0) {
+               if (run_program(program, udev->dev->subsystem, result, sizeof(result), NULL) != 0) {
                        dbg("PROGRAM is false");
                        udev->program_result[0] = '\0';
                        if (rule->program.operation != KEY_OP_NOMATCH)
@@ -854,9 +1136,12 @@ try_parent:
 
                        dbg("PROGRAM matches");
                        remove_trailing_chars(result, '\n');
-                       count = replace_untrusted_chars(result);
-                       if (count)
-                               info("%i untrusted character(s) replaced" , count);
+                       if (rule->string_escape == ESCAPE_UNSET ||
+                           rule->string_escape == ESCAPE_REPLACE) {
+                               count = replace_chars(result, ALLOWED_CHARS_INPUT);
+                               if (count > 0)
+                                       info("%i character(s) replaced" , count);
+                       }
                        dbg("result is '%s'", result);
                        strlcpy(udev->program_result, result, sizeof(udev->program_result));
                        dbg("PROGRAM returned successful");
@@ -901,15 +1186,71 @@ try_parent:
                struct key_pair *pair = &rule->env.keys[i];
 
                if (pair->key.operation == KEY_OP_ASSIGN) {
+                       char temp_value[NAME_SIZE];
                        const char *key_name = key_pair_name(rule, pair);
                        const char *value = key_val(rule, &pair->key);
 
-                       name_list_key_add(&udev->env_list, key_name, value);
-                       setenv(key_name, value, 1);
-                       dbg("export ENV '%s=%s'", key_name, value);
+                       /* make sure we don't write to the same string we possibly read from */
+                       strlcpy(temp_value, value, sizeof(temp_value));
+                       udev_rules_apply_format(udev, temp_value, NAME_SIZE);
+
+                       if (temp_value[0] == '\0') {
+                               name_list_key_remove(&udev->env_list, key_name);
+                               unsetenv(key_name);
+                               info("unset ENV '%s'", key_name);
+                       } else {
+                               struct name_entry *entry;
+
+                               entry = name_list_key_add(&udev->env_list, key_name, temp_value);
+                               if (entry == NULL)
+                                       break;
+                               putenv(entry->name);
+                               info("set ENV '%s'", entry->name);
+                       }
                }
        }
 
+       /* if we have ATTR assignments, write value to sysfs file */
+       for (i = 0; i < rule->attr.count; i++) {
+               struct key_pair *pair = &rule->attr.keys[i];
+
+               if (pair->key.operation == KEY_OP_ASSIGN) {
+                       const char *key_name = key_pair_name(rule, pair);
+                       char devpath[PATH_SIZE];
+                       char *attrib;
+                       char attr[PATH_SIZE] = "";
+                       char value[NAME_SIZE];
+                       FILE *f;
+
+                       if (attr_get_by_subsys_id(key_name, devpath, sizeof(devpath), &attrib)) {
+                               if (attrib != NULL) {
+                                       strlcpy(attr, sysfs_path, sizeof(attr));
+                                       strlcat(attr, devpath, sizeof(attr));
+                                       strlcat(attr, "/", sizeof(attr));
+                                       strlcat(attr, attrib, sizeof(attr));
+                               }
+                       }
+
+                       if (attr[0] == '\0') {
+                               strlcpy(attr, sysfs_path, sizeof(attr));
+                               strlcat(attr, udev->dev->devpath, sizeof(attr));
+                               strlcat(attr, "/", sizeof(attr));
+                               strlcat(attr, key_name, sizeof(attr));
+                       }
+
+                       strlcpy(value, key_val(rule, &pair->key), sizeof(value));
+                       udev_rules_apply_format(udev, value, sizeof(value));
+                       info("writing '%s' to sysfs file '%s'", value, attr);
+                       f = fopen(attr, "w");
+                       if (f != NULL) {
+                               if (!udev->test_run)
+                                       if (fprintf(f, "%s", value) <= 0)
+                                               err("error writing ATTR{%s}: %s", attr, strerror(errno));
+                               fclose(f);
+                       } else
+                               err("error opening ATTR{%s} for writing: %s", attr, strerror(errno));
+               }
+       }
        return 0;
 
 nomatch:
@@ -922,7 +1263,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
        int name_set = 0;
 
        dbg("udev->dev->devpath='%s'", udev->dev->devpath);
-       dbg("udev->dev->kernel_name='%s'", udev->dev->kernel_name);
+       dbg("udev->dev->kernel='%s'", udev->dev->kernel);
+
+       /* use kernel name as default node name */
+       strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 
        /* look for a matching rule to apply */
        udev_rules_iter_init(rules);
@@ -931,7 +1275,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                if (rule == NULL)
                        break;
 
-               if (name_set && rule->name.operation != KEY_OP_UNSET) {
+               if (name_set &&
+                   (rule->name.operation == KEY_OP_ASSIGN ||
+                    rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+                    rule->name.operation == KEY_OP_ADD)) {
                        dbg("node name already set, rule ignored");
                        continue;
                }
@@ -940,7 +1287,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                if (match_rule(udev, rule) == 0) {
                        /* apply options */
                        if (rule->ignore_device) {
-                               info("rule applied, '%s' is ignored", udev->dev->kernel_name);
+                               info("rule applied, '%s' is ignored", udev->dev->kernel);
                                udev->ignore_device = 1;
                                return 0;
                        }
@@ -948,6 +1295,10 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                udev->ignore_remove = 1;
                                dbg("remove event should be ignored");
                        }
+                       if (rule->link_priority != 0) {
+                               udev->link_priority = rule->link_priority;
+                               info("link_priority=%i", udev->link_priority);
+                       }
                        /* apply all_partitions option only at a main block device */
                        if (rule->partitions &&
                            strcmp(udev->dev->subsystem, "block") == 0 && udev->dev->kernel_number[0] == '\0') {
@@ -960,43 +1311,49 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                if (rule->mode_operation == KEY_OP_ASSIGN_FINAL)
                                        udev->mode_final = 1;
                                udev->mode = rule->mode;
-                               dbg("applied mode=%#o to '%s'", rule->mode, udev->dev->kernel_name);
+                               dbg("applied mode=%#o to '%s'", rule->mode, udev->dev->kernel);
                        }
                        if (!udev->owner_final && rule->owner.operation != KEY_OP_UNSET) {
                                if (rule->owner.operation == KEY_OP_ASSIGN_FINAL)
                                        udev->owner_final = 1;
                                strlcpy(udev->owner, key_val(rule, &rule->owner), sizeof(udev->owner));
                                udev_rules_apply_format(udev, udev->owner, sizeof(udev->owner));
-                               dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel_name);
+                               dbg("applied owner='%s' to '%s'", udev->owner, udev->dev->kernel);
                        }
                        if (!udev->group_final && rule->group.operation != KEY_OP_UNSET) {
                                if (rule->group.operation == KEY_OP_ASSIGN_FINAL)
                                        udev->group_final = 1;
                                strlcpy(udev->group, key_val(rule, &rule->group), sizeof(udev->group));
                                udev_rules_apply_format(udev, udev->group, sizeof(udev->group));
-                               dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel_name);
+                               dbg("applied group='%s' to '%s'", udev->group, udev->dev->kernel);
                        }
 
                        /* collect symlinks */
-                       if (!udev->symlink_final && rule->symlink.operation != KEY_OP_UNSET) {
+                       if (!udev->symlink_final &&
+                           (rule->symlink.operation == KEY_OP_ASSIGN ||
+                            rule->symlink.operation == KEY_OP_ASSIGN_FINAL ||
+                            rule->symlink.operation == KEY_OP_ADD)) {
                                char temp[PATH_SIZE];
                                char *pos, *next;
                                int count;
 
                                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) {
+                               if (rule->symlink.operation == KEY_OP_ASSIGN ||
+                                   rule->symlink.operation == KEY_OP_ASSIGN_FINAL) {
                                        info("reset symlink list");
                                        name_list_cleanup(&udev->symlink_list);
                                }
+                               /* allow  multiple symlinks separated by spaces */
                                strlcpy(temp, key_val(rule, &rule->symlink), sizeof(temp));
                                udev_rules_apply_format(udev, temp, sizeof(temp));
-                               count = replace_untrusted_chars(temp);
-                               if (count)
-                                       info("%i untrusted character(s) replaced" , count);
+                               if (rule->string_escape == ESCAPE_UNSET ||
+                                   rule->string_escape == ESCAPE_REPLACE) {
+                                       count = replace_chars(temp, ALLOWED_CHARS_FILE " ");
+                                       if (count > 0)
+                                               info("%i character(s) replaced" , count);
+                               }
                                dbg("rule applied, added symlink(s) '%s'", temp);
-
-                               /* add multiple symlinks separated by spaces */
                                pos = temp;
                                while (isspace(pos[0]))
                                        pos++;
@@ -1017,23 +1374,30 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                        }
 
                        /* set name, later rules with name set will be ignored */
-                       if (rule->name.operation != KEY_OP_UNSET) {
+                       if (rule->name.operation == KEY_OP_ASSIGN ||
+                           rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+                           rule->name.operation == KEY_OP_ADD) {
                                int count;
 
                                name_set = 1;
                                strlcpy(udev->name, key_val(rule, &rule->name), sizeof(udev->name));
                                udev_rules_apply_format(udev, udev->name, sizeof(udev->name));
-                               count = replace_untrusted_chars(udev->name);
-                               if (count)
-                                       info("%i untrusted character(s) replaced", count);
+                               if (rule->string_escape == ESCAPE_UNSET ||
+                                   rule->string_escape == ESCAPE_REPLACE) {
+                                       count = replace_chars(udev->name, ALLOWED_CHARS_FILE);
+                                       if (count > 0)
+                                               info("%i character(s) replaced", count);
+                               }
 
-                               info("rule applied, '%s' becomes '%s'", udev->dev->kernel_name, udev->name);
+                               info("rule applied, '%s' becomes '%s'", udev->dev->kernel, udev->name);
                                if (strcmp(udev->dev->subsystem, "net") != 0)
                                        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 (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
+                               struct name_entry *entry;
+
                                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) {
@@ -1041,7 +1405,9 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                                        name_list_cleanup(&udev->run_list);
                                }
                                dbg("add run '%s'", key_val(rule, &rule->run));
-                               name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+                               entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+                               if (rule->run_ignore_error)
+                                       entry->ignore_error = 1;
                        }
 
                        if (rule->last_rule) {
@@ -1056,10 +1422,8 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
                }
        }
 
-       if (!name_set) {
-               strlcpy(udev->name, udev->dev->kernel_name, sizeof(udev->name));
+       if (!name_set)
                info("no node name set, will use kernel name '%s'", udev->name);
-       }
 
        if (udev->tmp_node[0] != '\0') {
                dbg("removing temporary device node");
@@ -1074,7 +1438,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 {
        struct udev_rule *rule;
 
-       dbg("udev->kernel_name='%s'", udev->dev->kernel_name);
+       dbg("udev->kernel='%s'", udev->dev->kernel);
 
        /* look for a matching rule to apply */
        udev_rules_iter_init(rules);
@@ -1085,25 +1449,31 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev)
 
                dbg("process rule");
                if (rule->name.operation != KEY_OP_UNSET || rule->symlink.operation != KEY_OP_UNSET ||
-                   rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET || rule->group.operation != KEY_OP_UNSET) {
+                   rule->mode_operation != KEY_OP_UNSET || rule->owner.operation != KEY_OP_UNSET ||
+                   rule->group.operation != KEY_OP_UNSET) {
                        dbg("skip rule that names a device");
                        continue;
                }
 
                if (match_rule(udev, rule) == 0) {
                        if (rule->ignore_device) {
-                               info("rule applied, '%s' is ignored", udev->dev->kernel_name);
+                               info("rule applied, '%s' is ignored", udev->dev->kernel);
                                udev->ignore_device = 1;
                                return 0;
                        }
 
                        if (!udev->run_final && rule->run.operation != KEY_OP_UNSET) {
-                               if (rule->run.operation == KEY_OP_ASSIGN || rule->run.operation == KEY_OP_ASSIGN_FINAL) {
+                               struct name_entry *entry;
+
+                               if (rule->run.operation == KEY_OP_ASSIGN ||
+                                   rule->run.operation == KEY_OP_ASSIGN_FINAL) {
                                        info("reset run list");
                                        name_list_cleanup(&udev->run_list);
                                }
                                dbg("add run '%s'", key_val(rule, &rule->run));
-                               name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+                               entry = name_list_add(&udev->run_list, key_val(rule, &rule->run), 0);
+                               if (rule->run_ignore_error)
+                                       entry->ignore_error = 1;
                                if (rule->run.operation == KEY_OP_ASSIGN_FINAL)
                                        break;
                        }