#include "udev_rules.h"
#include "udev_db.h"
-static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
/* compare string with pattern (supports * ? [0-9] [!A-Z]) */
static int strcmp_pattern(const char *p, const char *s)
if (*str[0] == '{') {
pos = strchr(*str, '}');
if (pos == NULL) {
- dbg("missing closing brace for format");
+ err("missing closing brace for format");
return NULL;
}
pos[0] = '\0';
dbg("format length=%i", num);
return num;
} else {
- dbg("format parsing error '%s'", *str);
+ err("format parsing error '%s'", *str);
}
}
return -1;
}
}
+static int find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device,
+ const char *name, char *value, size_t len)
+{
+ struct sysfs_attribute *tmpattr;
+
+ dbg("look for device attribute '%s'", name);
+ if (class_dev) {
+ tmpattr = sysfs_get_classdev_attr(class_dev, name);
+ if (tmpattr)
+ goto attr_found;
+ }
+ if (sysfs_device) {
+ tmpattr = sysfs_get_device_attr(sysfs_device, name);
+ if (tmpattr)
+ goto attr_found;
+ }
+
+ return -1;
+
+attr_found:
+ strlcpy(value, tmpattr->value, len);
+ remove_trailing_char(value, '\n');
+
+ dbg("found attribute '%s'", tmpattr->path);
+ return 0;
+}
+
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
int len;
int i;
char c;
- struct sysfs_attribute *tmpattr;
unsigned int next_free_number;
struct sysfs_class_device *class_dev_parent;
cpos++;
}
if (i > 0) {
- dbg("requested part of result string not found");
+ err("requested part of result string not found");
break;
}
strlcpy(temp2, cpos, sizeof(temp2));
}
break;
case 's':
- if (!class_dev)
- break;
if (attr == NULL) {
dbg("missing attribute");
break;
}
- tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
- if (tmpattr == NULL) {
- dbg("sysfa attribute '%s' not found", attr);
- break;
- }
- /* strip trailing whitespace of matching value */
- if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
- i = len = strlen(tmpattr->value);
- while (i > 0 && isspace(tmpattr->value[i-1]))
- i--;
- if (i < len) {
- tmpattr->value[i] = '\0';
- dbg("remove %i trailing whitespace chars from '%s'",
- len - i, tmpattr->value);
+ if (find_sysfs_attribute(class_dev, sysfs_device, attr, temp2, sizeof(temp2)) != 0) {
+ struct sysfs_device *parent_device;
+
+ dbg("sysfs attribute '%s' not found, walk up the physical devices", attr);
+ parent_device = sysfs_get_device_parent(sysfs_device);
+ while (parent_device) {
+ dbg("looking at '%s'", parent_device->path);
+ if (find_sysfs_attribute(NULL, parent_device, attr, temp2, sizeof(temp2)) == 0)
+ break;
+ parent_device = sysfs_get_device_parent(parent_device);
}
+ if (!parent_device)
+ break;
}
- strlcat(string, tmpattr->value, maxsize);
- dbg("substitute sysfs value '%s'", tmpattr->value);
+ /* strip trailing whitespace of sysfs value */
+ i = strlen(temp2);
+ while (i > 0 && isspace(temp2[i-1]))
+ temp2[--i] = '\0';
+ replace_untrusted_chars(temp2);
+ strlcat(string, temp2, maxsize);
+ dbg("substitute sysfs value '%s'", temp2);
break;
case '%':
strlcat(string, "%", maxsize);
dbg("substitute udev_root '%s'", udev_root);
break;
default:
- dbg("unknown substitution type '%%%c'", c);
+ err("unknown substitution type '%%%c'", c);
break;
}
/* truncate to specified length */
retval = pipe(fds);
if (retval != 0) {
- dbg("pipe failed");
+ err("pipe failed");
return -1;
}
pid = fork();
switch(pid) {
case 0:
- /* child */
- /* dup2 write side of pipe to STDOUT */
+ /* child dup2 write side of pipe to STDOUT */
dup2(fds[1], STDOUT_FILENO);
retval = execv(arg, argv);
- info(KEY_PROGRAM " execution of '%s' failed", path);
- exit(1);
+ err("exec of program failed");
+ _exit(1);
case -1:
- dbg("fork failed");
- return -1;
+ err("fork of '%s' failed", path);
+ retval = -1;
+ break;
default:
/* parent reads from fds[0] */
close(fds[1]);
i = 0;
while (1) {
count = read(fds[0], value + i, len - i-1);
- if (count <= 0)
+ if (count < 0) {
+ err("read failed with '%s'", strerror(errno));
+ retval = -1;
+ }
+
+ if (count == 0)
break;
i += count;
if (i >= len-1) {
- dbg("result len %d too short", len);
+ err("result len %d too short", len);
retval = -1;
break;
}
}
-
- if (count < 0) {
- dbg("read failed with '%s'", strerror(errno));
- retval = -1;
- }
-
- if (i > 0 && value[i-1] == '\n')
- i--;
value[i] = '\0';
- dbg("result is '%s'", value);
close(fds[0]);
waitpid(pid, &status, 0);
retval = -1;
}
}
- return retval;
-}
-static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr)
-{
- struct sysfs_attribute *tmpattr = NULL;
- char *c;
-
- dbg("look for device attribute '%s'", attr);
- /* try to find the attribute in the class device directory */
- tmpattr = sysfs_get_classdev_attr(class_dev, attr);
- if (tmpattr)
- goto attr_found;
-
- /* look in the class device directory if present */
- if (sysfs_device) {
- tmpattr = sysfs_get_device_attr(sysfs_device, attr);
- if (tmpattr)
- goto attr_found;
- }
-
- return NULL;
-
-attr_found:
- c = strchr(tmpattr->value, '\n');
- if (c != NULL)
- c[0] = '\0';
-
- dbg("found attribute '%s'", tmpattr->path);
- return tmpattr;
-}
-
-static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct key_pair *pair)
-{
- struct sysfs_attribute *tmpattr;
- int i;
- int len;
-
- if ((pair == NULL) || (pair->name[0] == '\0') || (pair->value == '\0'))
- return -ENODEV;
-
- tmpattr = find_sysfs_attribute(class_dev, sysfs_device, pair->name);
- if (tmpattr == NULL)
- return -ENODEV;
-
- /* strip trailing whitespace of value, if not asked to match for it */
- if (! isspace(pair->value[strlen(pair->value)-1])) {
- i = len = strlen(tmpattr->value);
- while (i > 0 && isspace(tmpattr->value[i-1]))
- i--;
- if (i < len) {
- tmpattr->value[i] = '\0';
- dbg("remove %i trailing whitespace chars from '%s'",
- len - i, tmpattr->value);
- }
- }
-
- dbg("compare attribute '%s' value '%s' with '%s'",
- pair->name, tmpattr->value, pair->value);
- if (strcmp_pattern(pair->value, tmpattr->value) != 0)
- return -ENODEV;
-
- dbg("found matching attribute '%s' with value '%s'",
- pair->name, pair->value);
- return 0;
-}
-
-static int match_id(struct udev_rule *rule, struct sysfs_device *sysfs_device)
-{
- char path[PATH_SIZE];
- char *temp;
-
- strlcpy(path, sysfs_device->path, sizeof(path));
- temp = strrchr(path, '/');
- temp++;
- dbg("search '%s' in '%s', path='%s'", rule->id, temp, path);
- if (strcmp_pattern(rule->id, temp) != 0)
- return -ENODEV;
+ if (!retval) {
+ remove_trailing_char(value, '\n');
+ dbg("result is '%s'", value);
+ replace_untrusted_chars(value);
+ } else
+ value[0] = '\0';
- return 0;
+ return retval;
}
static int match_rule(struct udevice *udev, struct udev_rule *rule,
struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
- if (rule->kernel[0] != '\0') {
+ struct sysfs_device *parent_device = sysfs_device;
+
+ if (rule->kernel_operation != KEY_OP_UNSET) {
dbg("check for " KEY_KERNEL " rule->kernel='%s' class_dev->name='%s'",
rule->kernel, class_dev->name);
if (strcmp_pattern(rule->kernel, class_dev->name) != 0) {
dbg(KEY_KERNEL " key is true");
}
- if (rule->subsystem[0] != '\0') {
+ if (rule->subsystem_operation != KEY_OP_UNSET) {
dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' class_dev->name='%s'",
rule->subsystem, class_dev->name);
if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) {
/* walk up the chain of physical devices and find a match */
while (1) {
/* check for matching driver */
- if (rule->driver[0] != '\0') {
- if (sysfs_device == NULL) {
+ if (rule->driver_operation != KEY_OP_UNSET) {
+ if (parent_device == NULL) {
dbg("device has no sysfs_device");
- goto try_parent;
+ goto exit;
}
dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'",
- rule->driver, sysfs_device->driver_name);
- if (strcmp_pattern(rule->driver, sysfs_device->driver_name) != 0) {
+ rule->driver, parent_device->driver_name);
+ if (strcmp_pattern(rule->driver, parent_device->driver_name) != 0) {
dbg(KEY_DRIVER " is not matching");
if (rule->driver_operation != KEY_OP_NOMATCH)
goto try_parent;
}
/* check for matching bus value */
- if (rule->bus[0] != '\0') {
- if (sysfs_device == NULL) {
+ if (rule->bus_operation != KEY_OP_UNSET) {
+ if (parent_device == NULL) {
dbg("device has no sysfs_device");
- goto try_parent;
+ goto exit;
}
dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'",
- rule->bus, sysfs_device->bus);
- if (strcmp_pattern(rule->bus, sysfs_device->bus) != 0) {
+ rule->bus, parent_device->bus);
+ if (strcmp_pattern(rule->bus, parent_device->bus) != 0) {
dbg(KEY_BUS " is not matching");
if (rule->bus_operation != KEY_OP_NOMATCH)
goto try_parent;
}
/* check for matching bus id */
- if (rule->id[0] != '\0') {
- if (sysfs_device == NULL) {
+ if (rule->id_operation != KEY_OP_UNSET) {
+ if (parent_device == NULL) {
dbg("device has no sysfs_device");
- goto try_parent;
+ goto exit;
}
dbg("check " KEY_ID);
- if (match_id(rule, sysfs_device) != 0) {
+ if (strcmp_pattern(rule->id, parent_device->bus_id) != 0) {
dbg(KEY_ID " is not matching");
if (rule->id_operation != KEY_OP_NOMATCH)
goto try_parent;
dbg("check " KEY_SYSFS " pairs");
for (i = 0; i < rule->sysfs_pair_count; i++) {
struct key_pair *pair;
+ char value[VALUE_SIZE];
+ size_t len;
pair = &rule->sysfs_pair[i];
- if (compare_sysfs_attribute(class_dev, sysfs_device, pair) != 0) {
+ if (find_sysfs_attribute(class_dev, parent_device, pair->name, value, sizeof(value)) != 0)
+ goto try_parent;
+
+ /* strip trailing whitespace of value, if not asked to match for it */
+ len = strlen(pair->value);
+ if (len && !isspace(pair->value[len-1])) {
+ len = strlen(value);
+ while (len > 0 && isspace(value[len-1]))
+ value[--len] = '\0';
+ dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-len, value);
+ }
+
+ dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
+ if (strcmp_pattern(pair->value, value) != 0) {
dbg(KEY_SYSFS "{'%s'} is not matching", pair->name);
if (pair->operation != KEY_OP_NOMATCH)
goto try_parent;
break;
try_parent:
dbg("try parent sysfs device");
- sysfs_device = sysfs_get_device_parent(sysfs_device);
- if (sysfs_device == NULL)
+ parent_device = sysfs_get_device_parent(parent_device);
+ if (parent_device == NULL)
goto exit;
- dbg("sysfs_device->path='%s'", sysfs_device->path);
- dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+ dbg("look at sysfs_device->path='%s'", parent_device->path);
+ dbg("look at sysfs_device->bus_id='%s'", parent_device->bus_id);
}
/* execute external program */
- if (rule->program[0] != '\0') {
+ if (rule->program_operation != KEY_OP_UNSET) {
char program[PATH_SIZE];
dbg("check " KEY_PROGRAM);
}
/* check for matching result of external program */
- if (rule->result[0] != '\0') {
+ if (rule->result_operation != KEY_OP_UNSET) {
dbg("check for " KEY_RESULT " rule->result='%s', udev->program_result='%s'",
rule->result, udev->program_result);
if (strcmp_pattern(rule->result, udev->program_result) != 0) {
next = strchr(temp, ' ');
while (next) {
next[0] = '\0';
- dbg("add symlink '%s'", pos);
+ info("add symlink '%s'", pos);
name_list_add(&udev->symlink_list, pos, 0);
pos = &next[1];
next = strchr(pos, ' ');
}
- dbg("add symlink '%s'", pos);
+ info("add symlink '%s'", pos);
name_list_add(&udev->symlink_list, pos, 0);
}
if (udev->name[0] == '\0') {
/* no rule matched, so we use the kernel name */
strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
- dbg("no rule found, use kernel name '%s'", udev->name);
+ info("no rule found, use kernel name '%s'", udev->name);
}
if (udev->tmp_node[0] != '\0') {
~ianmdlvl / elogind.git / blobdiff