clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-05 05:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

machine: validate machine names using machine_name_is_valid() instead of string_is_safe()

Browse Source 
After all, we know have this as generic validator, so let's be correct
and use it wherver applicable.
This commit is contained in:
Lennart Poettering
2014-10-22 23:22:47 +02:00
parent 505e77caa5
commit affcf18915
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/sd-journal.c
+1 -1
View File
@@ -1735,7 +1735,7 @@ _public_ int sd_journal_open_container(sd_journal **ret, const char *machine, in
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return((flags & ~(SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM)) == 0, -EINVAL);
assert_return(filename_is_safe(machine), -EINVAL);
assert_return(machine_name_is_valid(machine), -EINVAL);
p = strappenda("/run/systemd/machines/", machine);
r = parse_env_file(p, NEWLINE, "ROOT", &root, "CLASS", &class, NULL);
src/libsystemd/sd-bus/sd-bus.c
+3 -3
View File
@@ -767,7 +767,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid)
if (!machine)
return -EINVAL;
if (!filename_is_safe(machine))
if (!machine_name_is_valid(machine))
return -EINVAL;
free(b->machine);
@@ -809,7 +809,7 @@ static int parse_container_kernel_address(sd_bus *b, const char **p, char **guid
if (!machine)
return -EINVAL;
if (!filename_is_safe(machine))
if (!machine_name_is_valid(machine))
return -EINVAL;
free(b->machine);
@@ -1309,7 +1309,7 @@ _public_ int sd_bus_open_system_container(sd_bus **ret, const char *machine) {
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return(filename_is_safe(machine), -EINVAL);
assert_return(machine_name_is_valid(machine), -EINVAL);
r = sd_bus_new(&bus);
if (r < 0)
src/shared/logs-show.c
+1 -1
View File
@@ -1155,7 +1155,7 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
assert(machine);
assert(boot_id);
if (!filename_is_safe(machine))
if (!machine_name_is_valid(machine))
return -EINVAL;
r = container_get_leader(machine, &pid);