#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"
-#include "klibc_fixups.h"
-#include "udevdb.h"
+#include "udev_db.h"
static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
-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)
{
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)
{
* @param name Name to check for
* @return 0 if <name> didn't exist and N otherwise.
*/
-static unsigned int find_free_number (struct udevice *udev, char *name)
+static int find_free_number(struct udevice *udev, const char *name)
{
- char temp[NAME_SIZE];
- char path[NAME_SIZE];
- struct udevice dev;
- int result;
+ char filename[NAME_SIZE];
+ int num = 0;
+ struct udevice db_udev;
- /* have to sweep the database for each lookup */
- result = 0;
- strncpy(temp, name, sizeof (temp));
+ strfieldcpy(filename, name);
while (1) {
- if (udevdb_get_dev_byname(temp, path, &dev) != 0)
- goto found;
- /* symlink might be stale if $(udevroot) isn't cleaned; check
- * on major/minor to see if it's the same device
- */
- if (dev.major == udev->major && dev.minor == udev->minor)
- goto found;
- snprintf (temp, sizeof(temp), "%s%d", name, ++result);
- }
+ dbg("look for existing node '%s'", filename);
+ memset(&db_udev, 0x00, sizeof(struct udevice));
+ if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+ dbg("free num=%d", num);
+ return num;
+ }
-found:
- return result;
+ num++;
+ if (num > 1000) {
+ info("find_free_number gone crazy (num=%d), aborted", num);
+ return -1;
+ }
+ snprintf(filename, NAME_SIZE, "%s%d", name, num);
+ filename[NAME_SIZE-1] = '\0';
+ }
}
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
case 'e':
next_free_number = find_free_number(udev, string);
if (next_free_number > 0) {
- snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+ sprintf(temp2, "%d", next_free_number);
strfieldcatmax(string, temp2, maxsize);
}
break;
}
}
-static int execute_program(const char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
{
int retval;
int count;
dbg("execute '%s' with parsed arguments", arg);
} else {
argv[0] = arg;
- argv[1] = main_argv[1];
+ argv[1] = udev->subsystem;
argv[2] = NULL;
dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
}
dbg("result is '%s'", value);
close(fds[0]);
- wait(&status);
+ waitpid(pid, &status, 0);
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
dbg("exec program status 0x%x", status);
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 */
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);
+ 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;
}
}
- /* check for matching kernel name*/
+ /* 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;
}
}
+ /* 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);
+ if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+ dbg(FIELD_SUBSYSTEM " is not matching");
+ goto try_parent;
+ } else {
+ 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);
+ if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+ dbg(FIELD_DRIVER " is not matching");
+ goto try_parent;
+ } else {
+ dbg(FIELD_DRIVER " matches");
+ }
+ }
+
/* check for matching bus id */
if (dev->id[0] != '\0') {
dbg("check " FIELD_ID);
dbg("check " FIELD_PROGRAM);
strfieldcpy(program, dev->program);
apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
- if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
+ if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
dbg(FIELD_PROGRAM " returned nonzero");
goto try_parent;
} else {
/* 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");
return -ENODEV;
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);
}
}
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
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);
/* 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 (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
- info("configured rule in '%s' at line %i applied, '%s' is ignored",
- dev->config_file, dev->config_line, udev->kernel_name);
- return -1;
+ /* empty name, symlink, perms will not create any node */
+ if (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 only rule values */
+ 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 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);
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;
+ 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 exit;
+
+ udev->partitions = dev->partitions;
+ if (dev->mode != 0000)
+ udev->mode = dev->mode;
+ if (dev->owner[0] != '\0') {
+ strfieldcpy(udev->owner, dev->owner);
+ apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+ }
+ 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",
+ udev->name, udev->owner, udev->group, udev->mode);
+
+ goto exit;
}
}
}
- /* 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;
-
- if (udev->type == 'n')
- goto done;
-
- udev->partitions = dev->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);
- } else {
- 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);
-done:
- /* store time of action */
- sysinfo(&info);
- udev->config_uptime = info.uptime;
+ /* 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);
+exit:
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;
-}
~ianmdlvl / elogind.git / blobdiff