chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: don't close std{in,out,err}
[elogind.git]
/
src
/
udev
/
udev-rules.c
diff --git
a/src/udev/udev-rules.c
b/src/udev/udev-rules.c
index cc562156fa693f693983cbdc01f9932619030512..db95442fda916730f1fb392ded5cecf64629e336 100644
(file)
--- a/
src/udev/udev-rules.c
+++ b/
src/udev/udev-rules.c
@@
-82,7
+82,7
@@
static unsigned int rules_add_string(struct udev_rules *rules, const char *s) {
return strbuf_add_string(rules->strbuf, s, strlen(s));
}
return strbuf_add_string(rules->strbuf, s, strlen(s));
}
-/* KEY=="", KEY!="", KEY+="", KEY="", KEY:="" */
+/* KEY=="", KEY!="", KEY+="", KEY
-="", KEY
="", KEY:="" */
enum operation_type {
OP_UNSET,
enum operation_type {
OP_UNSET,
@@
-91,6
+91,7
@@
enum operation_type {
OP_MATCH_MAX,
OP_ADD,
OP_MATCH_MAX,
OP_ADD,
+ OP_REMOVE,
OP_ASSIGN,
OP_ASSIGN_FINAL,
};
OP_ASSIGN,
OP_ASSIGN_FINAL,
};
@@
-224,6
+225,7
@@
static const char *operation_str(enum operation_type type) {
[OP_MATCH_MAX] = "MATCH_MAX",
[OP_ADD] = "add",
[OP_MATCH_MAX] = "MATCH_MAX",
[OP_ADD] = "add",
+ [OP_REMOVE] = "remove",
[OP_ASSIGN] = "assign",
[OP_ASSIGN_FINAL] = "assign-final",
} ;
[OP_ASSIGN] = "assign",
[OP_ASSIGN_FINAL] = "assign-final",
} ;
@@
-613,6
+615,7
@@
static int import_file_into_properties(struct udev_device *dev, const char *file
static int import_program_into_properties(struct udev_event *event,
usec_t timeout_usec,
static int import_program_into_properties(struct udev_event *event,
usec_t timeout_usec,
+ usec_t timeout_warn_usec,
const char *program, const sigset_t *sigmask) {
struct udev_device *dev = event->dev;
char **envp;
const char *program, const sigset_t *sigmask) {
struct udev_device *dev = event->dev;
char **envp;
@@
-621,7
+624,7
@@
static int import_program_into_properties(struct udev_event *event,
int err;
envp = udev_device_get_properties_envp(dev);
int err;
envp = udev_device_get_properties_envp(dev);
- err = udev_event_spawn(event, timeout_usec, program, envp, sigmask, result, sizeof(result));
+ err = udev_event_spawn(event, timeout_usec,
timeout_warn_usec,
program, envp, sigmask, result, sizeof(result));
if (err < 0)
return err;
if (err < 0)
return err;
@@
-761,7
+764,7
@@
static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
break;
if (linepos[0] == '=')
break;
break;
if (linepos[0] == '=')
break;
- if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+ if ((linepos[0] == '+') || (linepos[0] == '
-') || (linepos[0] == '
!') || (linepos[0] == ':'))
if (linepos[1] == '=')
break;
}
if (linepos[1] == '=')
break;
}
@@
-785,6
+788,9
@@
static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
} else if (linepos[0] == '+' && linepos[1] == '=') {
*op = OP_ADD;
linepos += 2;
} else if (linepos[0] == '+' && linepos[1] == '=') {
*op = OP_ADD;
linepos += 2;
+ } else if (linepos[0] == '-' && linepos[1] == '=') {
+ *op = OP_REMOVE;
+ linepos += 2;
} else if (linepos[0] == '=') {
*op = OP_ASSIGN;
linepos++;
} else if (linepos[0] == '=') {
*op = OP_ASSIGN;
linepos++;
@@
-1121,6
+1127,10
@@
static int add_rule(struct udev_rules *rules, char *line,
log_error("error parsing ATTR attribute");
goto invalid;
}
log_error("error parsing ATTR attribute");
goto invalid;
}
+ if (op == OP_REMOVE) {
+ log_error("invalid ATTR operation");
+ goto invalid;
+ }
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
} else {
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
} else {
@@
-1135,6
+1145,10
@@
static int add_rule(struct udev_rules *rules, char *line,
log_error("error parsing SECLABEL attribute");
goto invalid;
}
log_error("error parsing SECLABEL attribute");
goto invalid;
}
+ if (op == OP_REMOVE) {
+ log_error("invalid SECLABEL operation");
+ goto invalid;
+ }
rule_add_key(&rule_tmp, TK_A_SECLABEL, op, value, attr);
continue;
rule_add_key(&rule_tmp, TK_A_SECLABEL, op, value, attr);
continue;
@@
-1202,6
+1216,10
@@
static int add_rule(struct udev_rules *rules, char *line,
log_error("error parsing ENV attribute");
goto invalid;
}
log_error("error parsing ENV attribute");
goto invalid;
}
+ if (op == OP_REMOVE) {
+ log_error("invalid ENV operation");
+ goto invalid;
+ }
if (op < OP_MATCH_MAX) {
if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
goto invalid;
if (op < OP_MATCH_MAX) {
if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
goto invalid;
@@
-1242,6
+1260,10
@@
static int add_rule(struct udev_rules *rules, char *line,
}
if (streq(key, "PROGRAM")) {
}
if (streq(key, "PROGRAM")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid PROGRAM operation");
+ goto invalid;
+ }
rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
continue;
}
rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
continue;
}
@@
-1261,6
+1283,10
@@
static int add_rule(struct udev_rules *rules, char *line,
log_error("IMPORT{} type missing, ignoring IMPORT %s:%u", filename, lineno);
continue;
}
log_error("IMPORT{} type missing, ignoring IMPORT %s:%u", filename, lineno);
continue;
}
+ if (op == OP_REMOVE) {
+ log_error("invalid IMPORT operation");
+ goto invalid;
+ }
if (streq(attr, "program")) {
/* find known built-in command */
if (value[0] != '/') {
if (streq(attr, "program")) {
/* find known built-in command */
if (value[0] != '/') {
@@
-1316,6
+1342,10
@@
static int add_rule(struct udev_rules *rules, char *line,
attr = get_key_attribute(rules->udev, key + strlen("RUN"));
if (attr == NULL)
attr = "program";
attr = get_key_attribute(rules->udev, key + strlen("RUN"));
if (attr == NULL)
attr = "program";
+ if (op == OP_REMOVE) {
+ log_error("invalid RUN operation");
+ goto invalid;
+ }
if (streq(attr, "builtin")) {
enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
if (streq(attr, "builtin")) {
enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
@@
-1323,7
+1353,7
@@
static int add_rule(struct udev_rules *rules, char *line,
if (cmd < UDEV_BUILTIN_MAX)
rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
else
if (cmd < UDEV_BUILTIN_MAX)
rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
else
- log_error("
IMPORT
{builtin}: '%s' unknown %s:%u", value, filename, lineno);
+ log_error("
RUN
{builtin}: '%s' unknown %s:%u", value, filename, lineno);
} else if (streq(attr, "program")) {
enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
} else if (streq(attr, "program")) {
enum udev_builtin_cmd cmd = UDEV_BUILTIN_MAX;
@@
-1336,21
+1366,37
@@
static int add_rule(struct udev_rules *rules, char *line,
}
if (streq(key, "WAIT_FOR") || streq(key, "WAIT_FOR_SYSFS")) {
}
if (streq(key, "WAIT_FOR") || streq(key, "WAIT_FOR_SYSFS")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid WAIT_FOR/WAIT_FOR_SYSFS operation");
+ goto invalid;
+ }
rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
continue;
}
if (streq(key, "LABEL")) {
rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
continue;
}
if (streq(key, "LABEL")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid LABEL operation");
+ goto invalid;
+ }
rule_tmp.rule.rule.label_off = rules_add_string(rules, value);
continue;
}
if (streq(key, "GOTO")) {
rule_tmp.rule.rule.label_off = rules_add_string(rules, value);
continue;
}
if (streq(key, "GOTO")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid GOTO operation");
+ goto invalid;
+ }
rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
continue;
}
if (startswith(key, "NAME")) {
rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
continue;
}
if (startswith(key, "NAME")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid NAME operation");
+ goto invalid;
+ }
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
} else {
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
} else {
@@
-1371,6
+1417,10
@@
static int add_rule(struct udev_rules *rules, char *line,
}
if (streq(key, "SYMLINK")) {
}
if (streq(key, "SYMLINK")) {
+ if (op == OP_REMOVE) {
+ log_error("invalid SYMLINK operation");
+ goto invalid;
+ }
if (op < OP_MATCH_MAX)
rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
else
if (op < OP_MATCH_MAX)
rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
else
@@
-1383,6
+1433,11
@@
static int add_rule(struct udev_rules *rules, char *line,
uid_t uid;
char *endptr;
uid_t uid;
char *endptr;
+ if (op == OP_REMOVE) {
+ log_error("invalid OWNER operation");
+ goto invalid;
+ }
+
uid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
uid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
@@
-1400,6
+1455,11
@@
static int add_rule(struct udev_rules *rules, char *line,
gid_t gid;
char *endptr;
gid_t gid;
char *endptr;
+ if (op == OP_REMOVE) {
+ log_error("invalid GROUP operation");
+ goto invalid;
+ }
+
gid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
gid = strtoul(value, &endptr, 10);
if (endptr[0] == '\0') {
rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
@@
-1417,6
+1477,11
@@
static int add_rule(struct udev_rules *rules, char *line,
mode_t mode;
char *endptr;
mode_t mode;
char *endptr;
+ if (op == OP_REMOVE) {
+ log_error("invalid MODE operation");
+ goto invalid;
+ }
+
mode = strtol(value, &endptr, 8);
if (endptr[0] == '\0')
rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
mode = strtol(value, &endptr, 8);
if (endptr[0] == '\0')
rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
@@
-1429,6
+1494,11
@@
static int add_rule(struct udev_rules *rules, char *line,
if (streq(key, "OPTIONS")) {
const char *pos;
if (streq(key, "OPTIONS")) {
const char *pos;
+ if (op == OP_REMOVE) {
+ log_error("invalid OPTIONS operation");
+ goto invalid;
+ }
+
pos = strstr(value, "link_priority=");
if (pos != NULL) {
int prio = atoi(&pos[strlen("link_priority=")]);
pos = strstr(value, "link_priority=");
if (pos != NULL) {
int prio = atoi(&pos[strlen("link_priority=")]);
@@
-1793,6
+1863,7
@@
enum escape_type {
int udev_rules_apply_to_event(struct udev_rules *rules,
struct udev_event *event,
usec_t timeout_usec,
int udev_rules_apply_to_event(struct udev_rules *rules,
struct udev_event *event,
usec_t timeout_usec,
+ usec_t timeout_warn_usec,
const sigset_t *sigmask) {
struct token *cur;
struct token *rule;
const sigset_t *sigmask) {
struct token *cur;
struct token *rule;
@@
-2001,7
+2072,7
@@
int udev_rules_apply_to_event(struct udev_rules *rules,
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
- if (udev_event_spawn(event, timeout_usec, program, envp, sigmask, result, sizeof(result)) < 0) {
+ if (udev_event_spawn(event, timeout_usec,
timeout_warn_usec,
program, envp, sigmask, result, sizeof(result)) < 0) {
if (cur->key.op != OP_NOMATCH)
goto nomatch;
} else {
if (cur->key.op != OP_NOMATCH)
goto nomatch;
} else {
@@
-2037,7
+2108,7
@@
int udev_rules_apply_to_event(struct udev_rules *rules,
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
rules_str(rules, rule->rule.filename_off),
rule->rule.filename_line);
- if (import_program_into_properties(event, timeout_usec, import, sigmask) != 0)
+ if (import_program_into_properties(event, timeout_usec,
timeout_warn_usec,
import, sigmask) != 0)
if (cur->key.op != OP_NOMATCH)
goto nomatch;
break;
if (cur->key.op != OP_NOMATCH)
goto nomatch;
break;
@@
-2320,7
+2391,10
@@
int udev_rules_apply_to_event(struct udev_rules *rules,
log_error("ignoring invalid tag name '%s'", tag);
break;
}
log_error("ignoring invalid tag name '%s'", tag);
break;
}
- udev_device_add_tag(event->dev, tag);
+ if (cur->key.op == OP_REMOVE)
+ udev_device_remove_tag(event->dev, tag);
+ else
+ udev_device_add_tag(event->dev, tag);
break;
}
case TK_A_NAME: {
break;
}
case TK_A_NAME: {