#include <sys/stat.h>
#include <errno.h>
-#include "udev_libc_wrapper.h"
#include "udev.h"
-#include "udev_utils.h"
-#include "logging.h"
#include "udev_rules.h"
return 0;
}
-static int add_to_rules(struct udev_rules *rules, char *line)
+static int add_to_rules(struct udev_rules *rules, char *line, const char *filename, unsigned int lineno)
{
struct udev_rule *rule;
size_t rule_size;
}
if (strcasecmp(key, "KERNEL") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid KERNEL operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->kernel_name, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "SUBSYSTEM") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid SUBSYSTEM operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->subsystem, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "ACTION") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid ACTION operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->action, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "DEVPATH") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid DEVPATH operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->devpath, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "BUS") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid BUS operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->bus, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "ID") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid ID operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->id, operation, value);
valid = 1;
continue;
}
if (strncasecmp(key, "SYSFS", sizeof("SYSFS")-1) == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid SYSFS operation");
+ goto invalid;
+ }
attr = get_key_attribute(key + sizeof("SYSFS")-1);
if (attr == NULL) {
err("error parsing SYSFS attribute in '%s'", line);
pos = strchr(file, ' ');
if (pos)
pos[0] = '\0';
+
+ /* allow programs in /lib/udev called without the path */
+ if (strchr(file, '/') == NULL) {
+ strlcpy(file, "/lib/udev/", sizeof(file));
+ strlcat(file, value, sizeof(file));
+ pos = strchr(file, ' ');
+ if (pos)
+ pos[0] = '\0';
+ }
+
dbg("IMPORT auto mode for '%s'", file);
if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
dbg("IMPORT is executable, will be executed (autotype)");
}
if (strcasecmp(key, "DRIVER") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid DRIVER operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->driver, operation, value);
valid = 1;
continue;
}
if (strcasecmp(key, "RESULT") == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid RESULT operation");
+ goto invalid;
+ }
add_rule_key(rule, &rule->result, operation, value);
valid = 1;
continue;
rule->ignore_remove = 1;
}
}
- if (value[0] == '\0') {
- dbg("name empty device should be ignored");
- rule->name.operation = operation;
- rule->ignore_device = 1;
- } else
- add_rule_key(rule, &rule->name, operation, value);
+ if (value[0] == '\0')
+ dbg("name empty, node creation supressed");
+ add_rule_key(rule, &rule->name, operation, value);
continue;
}
char owner[32];
uid_t uid = lookup_user(value);
dbg("replacing username='%s' by id=%i", value, uid);
- sprintf(owner, "%li", uid);
+ sprintf(owner, "%u", (unsigned int) uid);
add_rule_key(rule, &rule->owner, operation, owner);
continue;
}
char group[32];
gid_t gid = lookup_group(value);
dbg("replacing groupname='%s' by id=%i", value, gid);
- sprintf(group, "%li", gid);
+ sprintf(group, "%u", (unsigned int) gid);
add_rule_key(rule, &rule->group, operation, group);
continue;
}
continue;
}
- err("unknown key '%s', in '%s'", key, line);
+ err("unknown key '%s'", key);
}
/* skip line if not any valid key was found */
- if (!valid) {
- err("invalid rule '%s'", line);
- goto exit;
- }
+ if (!valid)
+ goto invalid;
/* grow buffer and add rule */
rule_size = sizeof(struct udev_rule) + rule->bufsize;
exit:
free(rule);
return 0;
+
+invalid:
+ free(rule);
+ err("invalid rule '%s:%u'", filename, lineno);
+ return -1;
}
static int parse_file(struct udev_rules *rules, const char *filename)
{
char line[LINE_SIZE];
char *bufline;
- int lineno;
+ unsigned int lineno;
char *buf;
size_t bufsize;
size_t cur;
int retval = 0;
if (file_map(filename, &buf, &bufsize) != 0) {
- err("can't open '%s' as rules file", filename);
+ err("can't open '%s' as rules file: %s", filename, strerror(errno));
return -1;
}
dbg("reading '%s' as rules file", filename);
lineno++;
if (count >= sizeof(line)) {
- info("line too long, rule skipped %s, line %d", filename, lineno);
+ err("line too long, rule skipped '%s:%u'", filename, lineno);
continue;
}
line[j] = '\0';
dbg("read '%s'", line);
- add_to_rules(rules, line);
+ add_to_rules(rules, line, filename, lineno);
}
file_unmap(buf, bufsize);
return retval;
}
-static int rules_map(struct udev_rules *rules, const char *filename)
-{
- if (file_map(filename, &rules->buf, &rules->bufsize)) {
- rules->buf = NULL;
- return -1;
- }
- if (rules->bufsize == 0) {
- file_unmap(rules->buf, rules->bufsize);
- rules->buf = NULL;
- return -1;
- }
- rules->mapped = 1;
-
- return 0;
-}
-
-int udev_rules_init(struct udev_rules *rules, int read_compiled, int resolve_names)
+int udev_rules_init(struct udev_rules *rules, int resolve_names)
{
- char comp[PATH_SIZE];
struct stat stats;
int retval;
memset(rules, 0x00, sizeof(struct udev_rules));
rules->resolve_names = resolve_names;
- /* check for precompiled rules */
- if (read_compiled) {
- strlcpy(comp, udev_rules_filename, sizeof(comp));
- strlcat(comp, ".compiled", sizeof(comp));
- if (stat(comp, &stats) == 0) {
- dbg("map compiled rules '%s'", comp);
- if (rules_map(rules, comp) == 0)
- return 0;
- }
- }
-
/* parse rules file or all matching files in directory */
if (stat(udev_rules_filename, &stats) != 0)
return -1;
else
dbg("empty rules file '%s'", name_loop->name);
} else
- dbg("could not read '%s'", name_loop->name);
+ err("could not read '%s': %s", name_loop->name, strerror(errno));
list_del(&name_loop->node);
free(name_loop);
}
return retval;
}
-void udev_rules_close(struct udev_rules *rules)
+void udev_rules_cleanup(struct udev_rules *rules)
{
if (rules->buf) {
- if (rules->mapped) {
- rules->mapped = 0;
- file_unmap(rules->buf, rules->bufsize);
- } else
- free(rules->buf);
+ free(rules->buf);
rules->buf = NULL;
}
}
~ianmdlvl / elogind.git / blobdiff