SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: check validity before copying the input string

Browse Source 
Prompted by https://github.com/systemd/systemd/pull/20440#discussion_r689136337.
This commit is contained in:
Yu Watanabe
2021-08-16 13:48:15 +09:00
parent 634815762d
commit b40b8b06cb
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-network.c
+18 -17
View File
@@ -861,26 +861,26 @@ int config_parse_hostname(
void *data,
void *userdata) {
_cleanup_free_ char *hn = NULL;
char **hostname = data;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(hostname);
assert(data);
r = config_parse_string(unit, filename, line, section, section_line, lvalue, ltype, rvalue, &hn, userdata);
if (r < 0)
return r;
if (isempty(rvalue)) {
*hostname = mfree(*hostname);
return 0;
}
if (!hostname_is_valid(hn, 0)) {
if (!hostname_is_valid(rvalue, 0)) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Hostname is not valid, ignoring assignment: %s", rvalue);
return 0;
}
r = dns_name_is_valid(hn);
r = dns_name_is_valid(rvalue);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to check validity of hostname '%s', ignoring assignment: %m", rvalue);
@@ -892,7 +892,7 @@ int config_parse_hostname(
return 0;
}
return free_and_replace(*hostname, hn);
return free_and_strdup_warn(hostname, rvalue);
}
int config_parse_timezone(
@@ -907,26 +907,27 @@ int config_parse_timezone(
void *data,
void *userdata) {
_cleanup_free_ char *tz = NULL;
char **datap = data;
char **tz = data;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(datap);
assert(data);
r = config_parse_string(unit, filename, line, section, section_line, lvalue, ltype, rvalue, &tz, userdata);
if (r < 0)
return r;
if (isempty(rvalue)) {
*tz = mfree(*tz);
return 0;
}
if (!timezone_is_valid(tz, LOG_WARNING)) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
r = verify_timezone(rvalue, LOG_WARNING);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Timezone is not valid, ignoring assignment: %s", rvalue);
return 0;
}
return free_and_replace(*datap, tz);
return free_and_strdup_warn(tz, rvalue);
}
int config_parse_dns(