From 8e7b5bd0470a2bef5c9876f4924d028b1dba3367 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Jun 2018 21:27:57 +0900 Subject: [PATCH 1/3] conf-parser: simplify conf_parse_path() Follow-up for 97651797e83d0548aef9f808657d3518d89e5aee. --- src/shared/conf-parser.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 29dd1ddc88..4a41b814ae 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -716,10 +716,8 @@ int config_parse_path( assert(rvalue); assert(data); - if (isempty(rvalue)) { - n = NULL; + if (isempty(rvalue)) goto finalize; - } n = strdup(rvalue); if (!n) @@ -730,9 +728,7 @@ int config_parse_path( return fatal ? -ENOEXEC : 0; finalize: - free_and_replace(*s, n); - - return 0; + return free_and_replace(*s, n); } int config_parse_strv( From dcb37458cba57e94b8cd37167f25ad5430b83fd5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 3 Jun 2018 18:54:29 +0900 Subject: [PATCH 2/3] timesync: check validity of NTP server name or address --- src/timesync/test-timesync.c | 6 +++--- src/timesync/timesyncd-conf.c | 9 +++++++++ src/timesync/timesyncd-manager.c | 10 ++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c index 02fb2b7cf0..2bf484f121 100644 --- a/src/timesync/test-timesync.c +++ b/src/timesync/test-timesync.c @@ -24,9 +24,9 @@ static void test_manager_parse_string(void) { assert_se(m->have_fallbacks); assert_se(manager_parse_fallback_string(m, NTP_SERVERS) == 0); - assert_se(manager_parse_server_string(m, SERVER_SYSTEM, "time1.foobar.com time2.foobar.com") == 0); - assert_se(manager_parse_server_string(m, SERVER_FALLBACK, "time1.foobar.com time2.foobar.com") == 0); - assert_se(manager_parse_server_string(m, SERVER_LINK, "time1.foobar.com time2.foobar.com") == 0); + assert_se(manager_parse_server_string(m, SERVER_SYSTEM, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0); + assert_se(manager_parse_server_string(m, SERVER_FALLBACK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0); + assert_se(manager_parse_server_string(m, SERVER_LINK, "time1.foobar.com time2.foobar.com axrfav.,avf..ra 12345..123") == 0); } int main(int argc, char **argv) { diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index 23ee8f73d4..506781e1cc 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -7,6 +7,7 @@ #include "alloc-util.h" #include "def.h" +#include "dns-domain.h" #include "extract-word.h" #include "string-util.h" #include "timesyncd-conf.h" @@ -36,6 +37,14 @@ int manager_parse_server_string(Manager *m, ServerType type, const char *string) if (r == 0) break; + r = dns_name_is_valid_or_address(word); + if (r < 0) + return log_error_errno(r, "Failed to check validity of NTP server name or address '%s': %m", word); + if (r == 0) { + log_error("Invalid NTP server name or address, ignoring: %s", word); + continue; + } + /* Filter out duplicates */ LIST_FOREACH(names, n, first) if (streq_ptr(n->string, word)) { diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 46036c41f7..2c565aa8f8 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -20,6 +20,7 @@ #include "sd-daemon.h" #include "alloc-util.h" +#include "dns-domain.h" #include "fd-util.h" #include "fs-util.h" #include "list.h" @@ -968,6 +969,15 @@ static int manager_network_read_link_servers(Manager *m) { STRV_FOREACH(i, ntp) { bool found = false; + r = dns_name_is_valid_or_address(*i); + if (r < 0) { + log_error_errno(r, "Failed to check validity of NTP server name or address '%s': %m", *i); + goto clear; + } else if (r == 0) { + log_error("Invalid NTP server name or address, ignoring: %s", *i); + continue; + } + LIST_FOREACH(names, n, m->link_servers) if (streq(n->string, *i)) { n->marked = false; From ba0c011eee19dcb2c7c912f5b5c963159ef667f3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Jun 2018 22:32:45 +0900 Subject: [PATCH 3/3] timesync: add more log messages in manager_network_read_link_servers() --- src/timesync/timesyncd-manager.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 2c565aa8f8..ce47e355d1 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -960,8 +960,13 @@ static int manager_network_read_link_servers(Manager *m) { assert(m); r = sd_network_get_ntp(&ntp); - if (r < 0) + if (r < 0) { + if (r == -ENOMEM) + log_oom(); + else + log_debug_errno(r, "Failed to get link NTP servers: %m"); goto clear; + } LIST_FOREACH(names, n, m->link_servers) n->marked = true; @@ -987,8 +992,10 @@ static int manager_network_read_link_servers(Manager *m) { if (!found) { r = server_name_new(m, NULL, SERVER_LINK, *i); - if (r < 0) + if (r < 0) { + log_oom(); goto clear; + } changed = true; } @@ -1022,6 +1029,7 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re sd_network_monitor_flush(m->network_monitor); + /* When manager_network_read_link_servers() failed, we assume that the servers are changed. */ changed = !!manager_network_read_link_servers(m); /* check if the machine is online */ @@ -1115,7 +1123,7 @@ int manager_new(Manager **ret) { if (r < 0) return r; - manager_network_read_link_servers(m); + (void) manager_network_read_link_servers(m); *ret = TAKE_PTR(m);