shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

machined: validate machine names at more places

Browse Source 
When enumerating machines from /run, and when accepting machine names
for operations, be more strict and always validate.

Note that these checks are strictly speaking unnecessary, since
enumeration happens only on the trusted /run...
This commit is contained in:
Lennart Poettering 2015-08-23 14:33:50 +02:00
parent 25300b5a1f
commit b9a8d25081
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/util.c
View File

@ -4913,6 +4913,9 @@ int container_get_leader(const char *machine, pid_t *pid) {
assert(machine); assert(machine);
assert(pid); assert(pid);
if (!machine_name_is_valid(machine))
return -EINVAL;
p = strjoina("/run/systemd/machines/", machine); p = strjoina("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL); r = parse_env_file(p, NEWLINE, "LEADER", &s, "CLASS", &class, NULL);
if (r == -ENOENT) if (r == -ENOENT)

2
src/libsystemd/sd-login/sd-login.c
View File

@ -791,7 +791,7 @@ _public_ int sd_get_machine_names(char ***machines) {
/* Filter out the unit: symlinks */ /* Filter out the unit: symlinks */
for (a = l, b = l; *a; a++) { for (a = l, b = l; *a; a++) {
if (startswith(*a, "unit:")) if (startswith(*a, "unit:") || !machine_name_is_valid(*a))
free(*a); free(*a);
else { else {
*b = *a; *b = *a;

3
src/machine/machined.c
View File

@ -118,6 +118,9 @@ int manager_enumerate_machines(Manager *m) {
if (startswith(de->d_name, "unit:")) if (startswith(de->d_name, "unit:"))
continue; continue;
if (!machine_name_is_valid(de->d_name))
continue;
k = manager_add_machine(m, de->d_name, &machine); k = manager_add_machine(m, de->d_name, &machine);
if (k < 0) { if (k < 0) {
log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name); log_error_errno(k, "Failed to add machine by file name %s: %m", de->d_name);