#include "udev.h"
#include "udev_rules.h"
+#include "udev_selinux.h"
void udev_rules_iter_init(struct udev_rules *rules)
{
- dbg("bufsize=%zi", rules->bufsize);
+ dbg("bufsize=%zi\n", rules->bufsize);
rules->current = 0;
}
if (!rules)
return NULL;
- dbg("current=%zi", rules->current);
+ dbg("current=%zi\n", rules->current);
if (rules->current >= rules->bufsize) {
- dbg("no more rules");
+ dbg("no more rules\n");
return NULL;
}
static struct udev_rule *rule;
next:
- dbg("current=%zi", rules->current);
+ dbg("current=%zi\n", rules->current);
if (rules->current >= rules->bufsize) {
- dbg("no more rules");
+ dbg("no more rules\n");
return NULL;
}
rule = (struct udev_rule *) (rules->buf + rules->current);
if (strcmp(&rule->buf[rule->label.val_off], label) != 0) {
- dbg("moving forward, looking for label '%s'", label);
+ dbg("moving forward, looking for label '%s'\n", label);
rules->current += sizeof(struct udev_rule) + rule->bufsize;
goto next;
}
- dbg("found label '%s'", label);
+ dbg("found label '%s'\n", label);
return rule;
}
if (linepos[0] == '=' && linepos[1] == '=') {
*operation = KEY_OP_MATCH;
linepos += 2;
- dbg("operator=match");
+ dbg("operator=match\n");
} else if (linepos[0] == '!' && linepos[1] == '=') {
*operation = KEY_OP_NOMATCH;
linepos += 2;
- dbg("operator=nomatch");
+ dbg("operator=nomatch\n");
} else if (linepos[0] == '+' && linepos[1] == '=') {
*operation = KEY_OP_ADD;
linepos += 2;
- dbg("operator=add");
+ dbg("operator=add\n");
} else if (linepos[0] == '=') {
*operation = KEY_OP_ASSIGN;
linepos++;
- dbg("operator=assign");
+ dbg("operator=assign\n");
} else if (linepos[0] == ':' && linepos[1] == '=') {
*operation = KEY_OP_ASSIGN_FINAL;
linepos += 2;
- dbg("operator=assign_final");
+ dbg("operator=assign_final\n");
} else
return -1;
/* terminate key */
temp[0] = '\0';
- dbg("key='%s'", *key);
+ dbg("key='%s'\n", *key);
/* skip whitespace after operator */
while (isspace(linepos[0]))
return -1;
temp[0] = '\0';
temp++;
- dbg("value='%s'", *value);
+ dbg("value='%s'\n", *value);
/* move line to next key */
*line = temp;
attr++;
pos = strchr(attr, '}');
if (pos == NULL) {
- err("missing closing brace for format");
+ err("missing closing brace for format\n");
return NULL;
}
pos[0] = '\0';
- dbg("attribute='%s'", attr);
+ dbg("attribute='%s'\n", attr);
return attr;
}
size_t key_len = strnlen(key, PATH_SIZE);
if (pairs->count >= PAIRS_MAX) {
- err("skip, too many keys of the same type in a single rule");
+ err("skip, too many keys of the same type in a single rule\n");
return -1;
}
memset(buf, 0x00, sizeof(buf));
rule = (struct udev_rule *) buf;
+ rule->event_timeout = -1;
linepos = line;
valid = 0;
if (strcasecmp(key, "ACTION") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid ACTION operation");
+ err("invalid ACTION operation\n");
goto invalid;
}
add_rule_key(rule, &rule->action, operation, value);
if (strcasecmp(key, "DEVPATH") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DEVPATH operation");
+ err("invalid DEVPATH operation\n");
goto invalid;
}
add_rule_key(rule, &rule->devpath, operation, value);
if (strcasecmp(key, "KERNEL") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid KERNEL operation");
+ err("invalid KERNEL operation\n");
goto invalid;
}
add_rule_key(rule, &rule->kernel, operation, value);
if (strcasecmp(key, "SUBSYSTEM") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid SUBSYSTEM operation");
+ err("invalid SUBSYSTEM operation\n");
goto invalid;
}
/* bus, class, subsystem events should all be the same */
strcmp(value, "bus") == 0 ||
strcmp(value, "class") == 0) {
if (strcmp(value, "bus") == 0 || strcmp(value, "class") == 0)
- err("'%s' must be specified as 'subsystem' "
+ err("'%s' must be specified as 'subsystem' \n"
"please fix it in %s:%u", value, filename, lineno);
add_rule_key(rule, &rule->subsystem, operation, "subsystem|class|bus");
} else
if (strcasecmp(key, "DRIVER") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DRIVER operation");
+ err("invalid DRIVER operation\n");
goto invalid;
}
add_rule_key(rule, &rule->driver, operation, value);
if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
attr = get_key_attribute(key + sizeof("ATTR")-1);
if (attr == NULL) {
- err("error parsing ATTR attribute");
+ err("error parsing ATTR attribute\n");
goto invalid;
}
if (add_rule_key_pair(rule, &rule->attr, operation, attr, value) != 0)
strcasecmp(key, "ID") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid KERNELS operation");
+ err("invalid KERNELS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->kernels, operation, value);
strcasecmp(key, "BUS") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid SUBSYSTEMS operation");
+ err("invalid SUBSYSTEMS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->subsystems, operation, value);
if (strcasecmp(key, "DRIVERS") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid DRIVERS operation");
+ err("invalid DRIVERS operation\n");
goto invalid;
}
add_rule_key(rule, &rule->drivers, operation, value);
strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid ATTRS operation");
+ err("invalid ATTRS operation\n");
goto invalid;
}
attr = get_key_attribute(key + sizeof("ATTRS")-1);
if (attr == NULL) {
- err("error parsing ATTRS attribute");
+ err("error parsing ATTRS attribute\n");
goto invalid;
}
if (strncmp(attr, "device/", 7) == 0)
- err("the 'device' link is deprecated and will be removed from a future kernel, "
+ err("the 'device' link is deprecated and will be removed from a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
else if (strstr(attr, "../") != NULL)
- err("do not reference parent sysfs directories directly, that may break with a future kernel, "
+ err("do not reference parent sysfs directories directly, that may break with a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
if (add_rule_key_pair(rule, &rule->attrs, operation, attr, value) != 0)
goto invalid;
if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
attr = get_key_attribute(key + sizeof("ENV")-1);
if (attr == NULL) {
- err("error parsing ENV attribute");
+ err("error parsing ENV attribute\n");
goto invalid;
}
if (strncmp(attr, "PHYSDEV", 7) == 0)
if (strcasecmp(key, "RESULT") == 0) {
if (operation != KEY_OP_MATCH &&
operation != KEY_OP_NOMATCH) {
- err("invalid RESULT operation");
+ err("invalid RESULT operation\n");
goto invalid;
}
add_rule_key(rule, &rule->result, operation, value);
if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
attr = get_key_attribute(key + sizeof("IMPORT")-1);
if (attr != NULL && strstr(attr, "program")) {
- dbg("IMPORT will be executed");
+ dbg("IMPORT will be executed\n");
rule->import_type = IMPORT_PROGRAM;
} else if (attr != NULL && strstr(attr, "file")) {
- dbg("IMPORT will be included as file");
+ dbg("IMPORT will be included as file\n");
rule->import_type = IMPORT_FILE;
} else if (attr != NULL && strstr(attr, "parent")) {
- dbg("IMPORT will include the parent values");
+ dbg("IMPORT will include the parent values\n");
rule->import_type = IMPORT_PARENT;
} else {
/* figure it out if it is executable */
pos[0] = '\0';
}
- dbg("IMPORT auto mode for '%s'", file);
+ dbg("IMPORT auto mode for '%s'\n", file);
if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
- dbg("IMPORT is executable, will be executed (autotype)");
+ dbg("IMPORT is executable, will be executed (autotype)\n");
rule->import_type = IMPORT_PROGRAM;
} else {
- dbg("IMPORT is not executable, will be included as file (autotype)");
+ dbg("IMPORT is not executable, will be included as file (autotype)\n");
rule->import_type = IMPORT_FILE;
}
}
}
if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+ if (operation != KEY_OP_MATCH &&
+ operation != KEY_OP_NOMATCH) {
+ err("invalid TEST operation\n");
+ goto invalid;
+ }
attr = get_key_attribute(key + sizeof("TEST")-1);
if (attr != NULL)
rule->test_mode_mask = strtol(attr, NULL, 8);
continue;
}
- if (strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
- add_rule_key(rule, &rule->wait_for_sysfs, operation, value);
+ if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+ add_rule_key(rule, &rule->wait_for, operation, value);
valid = 1;
continue;
}
attr = get_key_attribute(key + sizeof("NAME")-1);
if (attr != NULL) {
if (strstr(attr, "all_partitions") != NULL) {
- dbg("creation of partition nodes requested");
+ dbg("creation of partition nodes requested\n");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
}
if (strstr(attr, "ignore_remove") != NULL) {
- dbg("remove event should be ignored");
+ dbg("remove event should be ignored\n");
rule->ignore_remove = 1;
}
}
if (value[0] == '\0')
- dbg("name empty, node creation supressed");
+ dbg("name empty, node creation supressed\n");
add_rule_key(rule, &rule->name, operation, value);
continue;
}
if (endptr[0] != '\0') {
char owner[32];
uid_t uid = lookup_user(value);
- dbg("replacing username='%s' by id=%i", value, uid);
+ dbg("replacing username='%s' by id=%i\n", value, uid);
sprintf(owner, "%u", (unsigned int) uid);
add_rule_key(rule, &rule->owner, operation, owner);
continue;
if (endptr[0] != '\0') {
char group[32];
gid_t gid = lookup_group(value);
- dbg("replacing groupname='%s' by id=%i", value, gid);
+ dbg("replacing groupname='%s' by id=%i\n", value, gid);
sprintf(group, "%u", (unsigned int) gid);
add_rule_key(rule, &rule->group, operation, group);
continue;
}
if (strcasecmp(key, "MODE") == 0) {
- rule->mode = strtol(value, NULL, 8);
- rule->mode_operation = operation;
+ add_rule_key(rule, &rule->mode, operation, value);
valid = 1;
continue;
}
const char *pos;
if (strstr(value, "last_rule") != NULL) {
- dbg("last rule to be applied");
+ dbg("last rule to be applied\n");
rule->last_rule = 1;
}
if (strstr(value, "ignore_device") != NULL) {
- dbg("device should be ignored");
+ dbg("device should be ignored\n");
rule->ignore_device = 1;
}
if (strstr(value, "ignore_remove") != NULL) {
- dbg("remove event should be ignored");
+ dbg("remove event should be ignored\n");
rule->ignore_remove = 1;
}
pos = strstr(value, "link_priority=");
if (pos != NULL) {
rule->link_priority = atoi(&pos[strlen("link_priority=")]);
- dbg("link priority=%i", rule->link_priority);
+ dbg("link priority=%i\n", rule->link_priority);
+ }
+ pos = strstr(value, "event_timeout=");
+ if (pos != NULL) {
+ rule->event_timeout = atoi(&pos[strlen("event_timeout=")]);
+ dbg("event timout=%i\n", rule->event_timeout);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
rule->string_escape = ESCAPE_REPLACE;
}
if (strstr(value, "all_partitions") != NULL) {
- dbg("creation of partition nodes requested");
+ dbg("creation of partition nodes requested\n");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
}
valid = 1;
continue;
}
- err("unknown key '%s' in %s:%u", key, filename, lineno);
+ err("unknown key '%s' in %s:%u\n", key, filename, lineno);
}
- if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
- err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+ if (physdev && rule->wait_for.operation == KEY_OP_UNSET)
+ err("PHYSDEV* values are deprecated and will be removed from a future kernel, \n"
"please fix it in %s:%u", filename, lineno);
/* skip line if not any valid key was found */
/* grow buffer and add rule */
rule_size = sizeof(struct udev_rule) + rule->bufsize;
padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
- dbg("add %zi padding bytes", padding);
+ dbg("add %zi padding bytes\n", padding);
rule_size += padding;
rule->bufsize += padding;
rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
if (!rules->buf) {
- err("realloc failed");
+ err("realloc failed\n");
goto exit;
}
- dbg("adding rule to offset %zi", rules->bufsize);
+ dbg("adding rule to offset %zi\n", rules->bufsize);
memcpy(rules->buf + rules->bufsize, rule, rule_size);
rules->bufsize += rule_size;
exit:
return 0;
invalid:
- err("invalid rule '%s:%u'", filename, lineno);
+ err("invalid rule '%s:%u'\n", filename, lineno);
return -1;
}
int retval = 0;
if (file_map(filename, &buf, &bufsize) != 0) {
- err("can't open '%s' as rules file: %s", filename, strerror(errno));
+ err("can't open '%s' as rules file: %s\n", filename, strerror(errno));
return -1;
}
- info("reading '%s' as rules file", filename);
+ info("reading '%s' as rules file\n", filename);
/* loop through the whole file */
cur = 0;
continue;
if (count >= sizeof(line)) {
- err("line too long, rule skipped '%s:%u'", filename, lineno);
+ err("line too long, rule skipped '%s:%u'\n", filename, lineno);
continue;
}
}
line[j] = '\0';
- dbg("read '%s'", line);
+ dbg("read '%s'\n", line);
add_to_rules(rules, line, filename, lineno);
}
if (stat(udev_rules_dir, &statbuf) != 0)
return -1;
if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
- dbg("parse single rules file '%s'", udev_rules_dir);
+ dbg("parse single rules file '%s'\n", udev_rules_dir);
name_list_add(&name_list, udev_rules_dir, 1);
} else {
- dbg("parse rules directory '%s'", udev_rules_dir);
+ dbg("parse rules directory '%s'\n", udev_rules_dir);
retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
}
strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
if (stat(filename, &statbuf) != 0) {
create_path(filename);
+ selinux_setfscreatecon(filename, NULL, S_IFDIR|0755);
mkdir(filename, 0755);
+ selinux_resetfscreatecon();
}
add_matching_files(&dyn_list, filename, RULESFILE_SUFFIX);
if (statbuf.st_size)
parse_file(rules, name_loop->name);
else
- dbg("empty rules file '%s'", name_loop->name);
+ dbg("empty rules file '%s'\n", name_loop->name);
} else
- err("could not read '%s': %s", name_loop->name, strerror(errno));
+ err("could not read '%s': %s\n", name_loop->name, strerror(errno));
list_del(&name_loop->node);
free(name_loop);
}
~ianmdlvl / elogind.git / blobdiff