Skip to content

Commit 55a69c7

Browse files
yuwatabluca
authored andcommitted
resolve: ignore nameserver= and domain= kernel command line options without value
Otherwise, manager_parse_dns_server_string_and_warn() or manager_parse_search_domains_and_warn() will trigger assertion. (cherry picked from commit 91acee9) (cherry picked from commit 08c1aff)
1 parent 6b1a3e0 commit 55a69c7

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/resolve/resolved-conf.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,10 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
519519
* interpret, for example dracut and SUSE Linux. */
520520

521521
if (proc_cmdline_key_streq(key, "nameserver")) {
522+
523+
if (proc_cmdline_value_missing(key, value))
524+
return 0;
525+
522526
if (!info->dns_server_unlinked) {
523527
/* The kernel command line overrides any prior configuration */
524528
dns_server_unlink_all(manager_get_first_dns_server(info->manager, DNS_SERVER_SYSTEM));
@@ -533,6 +537,9 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
533537

534538
} else if (proc_cmdline_key_streq(key, "domain")) {
535539

540+
if (proc_cmdline_value_missing(key, value))
541+
return 0;
542+
536543
if (!info->search_domain_unlinked) {
537544
dns_search_domain_unlink_all(info->manager->search_domains);
538545
info->search_domain_unlinked = true;

0 commit comments

Comments
 (0)