chiark / gitweb /
[PATCH] namedev: if SUBSYSTEM or KERNEL key doesn't match, give up immediately
[elogind.git] / namedev.c
index dca405ceba1d041be35f08e612f26e1ce4acf937..bbc5b40069d552179c90768417827e6adb3a0bfb 100644 (file)
--- a/namedev.c
+++ b/namedev.c
 #include <errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/sysinfo.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
 
-LIST_HEAD(config_device_list);
-LIST_HEAD(perm_device_list);
-
-
 /* compare string with pattern (supports * ? [0-9] [!A-Z]) */
 static int strcmp_pattern(const char *p, const char *s)
 {
@@ -101,44 +96,6 @@ static int strcmp_pattern(const char *p, const char *s)
        return 1;
 }
 
-static struct perm_device *find_perm(char *name)
-{
-       struct perm_device *perm;
-
-       list_for_each_entry(perm, &perm_device_list, node) {
-               if (strcmp_pattern(perm->name, name))
-                       continue;
-               return perm;
-       }
-       return NULL;
-}
-
-static mode_t get_default_mode(void)
-{
-       mode_t mode = 0600;     /* default to owner rw only */
-
-       if (strlen(default_mode_str) != 0)
-               mode = strtol(default_mode_str, NULL, 8);
-
-       return mode;
-}
-
-static char *get_default_owner(void)
-{
-       if (strlen(default_owner_str) == 0)
-               strfieldcpy(default_owner_str, "root");
-
-       return default_owner_str;
-}
-
-static char *get_default_group(void)
-{
-       if (strlen(default_group_str) == 0)
-               strfieldcpy(default_group_str, "root");
-
-       return default_group_str;
-}
-
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
 {
@@ -226,6 +183,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        int slen;
        struct sysfs_attribute *tmpattr;
        unsigned int next_free_number;
+       struct sysfs_class_device *class_dev_parent;
 
        pos = string;
        while (1) {
@@ -244,6 +202,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 
 
                switch (c) {
+               case 'p':
+                       if (strlen(udev->devpath) == 0)
+                               break;
+                       strfieldcatmax(string, udev->devpath, maxsize);
+                       dbg("substitute kernel name '%s'", udev->kernel_name);
+                       break;
                case 'b':
                        if (strlen(udev->bus_id) == 0)
                                break;
@@ -333,6 +297,35 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                strfieldcatmax(string, temp2, maxsize);
                        }
                        break;
+               case 'P':
+                       class_dev_parent = sysfs_get_classdev_parent(class_dev);
+                       if (class_dev_parent != NULL) {
+                               struct udevice udev_parent;
+
+                               dbg("found parent '%s', get the node name", class_dev_parent->path);
+                               memset(&udev_parent, 0x00, sizeof(struct udevice));
+                               /* lookup the name in the udev_db with the DEVPATH of the parent */
+                               strfieldcpy(udev_parent.devpath, &class_dev_parent->path[strlen(sysfs_path)]);
+                               if (udev_db_get_device(&udev_parent) == 0) {
+                                       strfieldcatmax(string, udev_parent.name, maxsize);
+                                       dbg("substitute parent node name'%s'", udev_parent.name);
+                               } else
+                                       dbg("parent not found in database");
+                       }
+                       break;
+               case 'N':
+                       if (udev->tmp_node[0] == '\0') {
+                               dbg("create temporary device node for callout");
+                               snprintf(udev->tmp_node, NAME_SIZE-1, "%s/.tmp-%u-%u", udev_root, udev->major, udev->minor);
+                               udev_make_node(udev, udev->tmp_node, udev->major, udev->minor, 0600, 0, 0);
+                       }
+                       strfieldcatmax(string, udev->tmp_node, maxsize);
+                       dbg("substitute temporary device node name '%s'", udev->tmp_node);
+                       break;
+               case 'r':
+                       strfieldcatmax(string, udev_root, maxsize);
+                       dbg("substitute udev_root '%s'", udev_root);
+                       break;
                default:
                        dbg("unknown substitution type '%%%c'", c);
                        break;
@@ -586,49 +579,36 @@ static int match_place(struct config_device *dev, struct sysfs_class_device *cla
        return 0;
 }
 
-static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_rule(struct udevice *udev, struct config_device *dev,
+                     struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        while (1) {
-               /* check for matching bus value */
-               if (dev->bus[0] != '\0') {
-                       if (sysfs_device == NULL) {
-                               dbg("device has no bus");
-                               goto try_parent;
-                       }
-                       dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
-                       if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
-                               dbg(FIELD_BUS " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_BUS " matches");
-                       }
-               }
-
                /* check for matching kernel name */
                if (dev->kernel[0] != '\0') {
-                       dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
+                       dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
+                           dev->kernel, class_dev->name);
                        if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
                                dbg(FIELD_KERNEL " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_KERNEL " matches");
+                               goto exit;
                        }
+                       dbg(FIELD_KERNEL " matches");
                }
 
                /* check for matching subsystem */
                if (dev->subsystem[0] != '\0') {
-                       dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'", dev->subsystem, class_dev->name);
+                       dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
+                           dev->subsystem, class_dev->name);
                        if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
                                dbg(FIELD_SUBSYSTEM " is not matching");
-                               goto try_parent;
-                       } else {
-                               dbg(FIELD_SUBSYSTEM " matches");
+                               goto exit;
                        }
+                       dbg(FIELD_SUBSYSTEM " matches");
                }
 
                /* check for matching driver */
                if (dev->driver[0] != '\0') {
-                       dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'", dev->driver, sysfs_device->driver_name);
+                       dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
+                           dev->driver, sysfs_device->driver_name);
                        if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
                                dbg(FIELD_DRIVER " is not matching");
                                goto try_parent;
@@ -637,6 +617,21 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        }
                }
 
+               /* check for matching bus value */
+               if (dev->bus[0] != '\0') {
+                       if (sysfs_device == NULL) {
+                               dbg("device has no bus");
+                               goto try_parent;
+                       }
+                       dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'",
+                           dev->bus, sysfs_device->bus);
+                       if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
+                               dbg(FIELD_BUS " is not matching");
+                               goto try_parent;
+                       }
+                       dbg(FIELD_BUS " matches");
+               }
+
                /* check for matching bus id */
                if (dev->id[0] != '\0') {
                        dbg("check " FIELD_ID);
@@ -687,8 +682,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 
                /* check for matching result of external program */
                if (dev->result[0] != '\0') {
-                       dbg("check for " FIELD_RESULT
-                           " dev->result='%s', udev->program_result='%s'",
+                       dbg("check for " FIELD_RESULT " dev->result='%s', udev->program_result='%s'",
                            dev->result, udev->program_result);
                        if (strcmp_pattern(dev->result, udev->program_result) != 0) {
                                dbg(FIELD_RESULT " is not matching");
@@ -698,19 +692,20 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        }
                }
 
-               /* Yeah, we matched! */
+               /* we matched */
                return 0;
 
 try_parent:
                dbg("try parent sysfs device");
                sysfs_device = sysfs_get_device_parent(sysfs_device);
                if (sysfs_device == NULL)
-                       return -ENODEV;
+                       goto exit;
                dbg("sysfs_device->path='%s'", sysfs_device->path);
                dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
-               dbg("sysfs_device->bus='%s'", sysfs_device->bus);
        }
 
+exit:
+       return -1;
 }
 
 int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
@@ -718,11 +713,8 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        struct sysfs_class_device *class_dev_parent;
        struct sysfs_device *sysfs_device = NULL;
        struct config_device *dev;
-       struct perm_device *perm;
-       struct sysinfo info;
        char *pos;
 
-       udev->mode = 0;
        dbg("class_dev->name='%s'", class_dev->name);
 
        /* Figure out where the "device"-symlink is at.  For char devices this will
@@ -742,7 +734,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
                    sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
                strfieldcpy(udev->bus_id, sysfs_device->bus_id);
-               strfieldcpy(udev->bus, sysfs_device->bus);
        }
 
        strfieldcpy(udev->kernel_name, class_dev->name);
@@ -759,17 +750,37 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        /* look for a matching rule to apply */
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
-               if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-                               info("configured rule in '%s' at line %i applied, '%s' is ignored",
+               if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
+
+                       /* empty name, symlink and perms will not create any node */
+                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
+                           dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0') {
+                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
                                     dev->config_file, dev->config_line, udev->kernel_name);
                                return -1;
                        }
 
+                       /* apply permissions */
+                       if (dev->mode != 0000) {
+                               udev->mode = dev->mode;
+                               dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+                       }
+                       if (dev->owner[0] != '\0') {
+                               strfieldcpy(udev->owner, dev->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 (dev->group[0] != '\0') {
+                               strfieldcpy(udev->group, dev->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 for this or the final matching rule */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];
 
-                               info("configured rule in '%s' at line %i applied, added symlink '%s'",
+                               info("configured rule in '%s[%i]' applied, added symlink '%s'",
                                     dev->config_file, dev->config_line, dev->symlink);
                                strfieldcpy(temp, dev->symlink);
                                apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
@@ -778,83 +789,45 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                strfieldcat(udev->symlink, temp);
                        }
 
+                       /* rule matches */
                        if (dev->name[0] != '\0') {
                                /* apply all_partitions flag only at a main block device */
                                if (dev->partitions > 0 &&
                                    (udev->type != 'b' || udev->kernel_number[0] != '\0'))
                                        continue;
 
-                               info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+                               info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
                                     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
-                               strfieldcpy(udev->name, dev->name);
-                               goto found;
-                       }
-               }
-       }
-       /* no rule was found so we use the kernel name */
-       strfieldcpy(udev->name, udev->kernel_name);
-       if (udev->type == 'n')
-               goto done;
-       else
-               goto perms;
 
-found:
-       apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-       strfieldcpy(udev->config_file, dev->config_file);
-       udev->config_line = dev->config_line;
+                               strfieldcpy(udev->name, dev->name);
+                               apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+                               strfieldcpy(udev->config_file, dev->config_file);
+                               udev->config_line = dev->config_line;
+                               udev->ignore_remove = dev->ignore_remove;
 
-       if (udev->type == 'n')
-               goto done;
+                               if (udev->type == 'n')
+                                       goto exit;
 
-       udev->partitions = dev->partitions;
-       udev->ignore_remove = dev->ignore_remove;
+                               udev->partitions = dev->partitions;
 
-       if (dev->group[0] != '\0') {
-               strfieldcpy(udev->group, dev->group);
-               apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);  
-       }
+                               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);
 
-       /* get permissions given in rule */
-       set_empty_perms(udev, dev->mode,
-                             dev->owner,
-                             dev->group);
-
-perms:
-       /* get permissions given in config file or set defaults */
-       perm = find_perm(udev->name);
-       if (perm != NULL) {
-               set_empty_perms(udev, perm->mode,
-                                     perm->owner,
-                                     perm->group);
+                               goto exit;
+                       }
+               }
        }
-       set_empty_perms(udev, get_default_mode(),
-                             get_default_owner(),
-                             get_default_group());
 
-       dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
-           udev->name, udev->owner, udev->group, udev->mode);
+       /* no rule matched, so we use the kernel name */
+       strfieldcpy(udev->name, udev->kernel_name);
+       dbg("no rule found, use kernel name '%s'", udev->name);
 
-done:
-       /* store time of action */
-       sysinfo(&info);
-       udev->config_uptime = info.uptime;
+exit:
+       if (udev->tmp_node[0] != '\0') {
+               dbg("removing temporary device node");
+               unlink_secure(udev->tmp_node);
+               udev->tmp_node[0] = '\0';
+       }
 
        return 0;
 }
-
-int namedev_init(void)
-{
-       int retval;
-
-       retval = namedev_init_rules();
-       if (retval)
-               return retval;
-
-       retval = namedev_init_permissions();
-       if (retval)
-               return retval;
-
-       dump_config_dev_list();
-       dump_perm_dev_list();
-       return retval;
-}