picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-dhcp-lease: verify hostname and domainnames we receive

This commit is contained in:
Tom Gundersen 2014-08-15 01:04:53 +02:00
parent bda2c408f8
commit 784d9b9c09
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libsystemd-network/sd-dhcp-lease.c
View File

@ -513,19 +513,39 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option,
break;
case DHCP_OPTION_DOMAIN_NAME:
r = lease_parse_string(option, len, &lease->domainname);
{
_cleanup_free_ char *domainname = NULL;
r = lease_parse_string(option, len, &domainname);
if (r < 0)
return r;
break;
if (!hostname_is_valid(domainname) || is_localhost(domainname))
break;
free(lease->domainname);
lease->domainname = domainname;
domainname = NULL;
break;
}
case DHCP_OPTION_HOST_NAME:
r = lease_parse_string(option, len, &lease->hostname);
{
_cleanup_free_ char *hostname = NULL;
r = lease_parse_string(option, len, &hostname);
if (r < 0)
return r;
break;
if (!hostname_is_valid(hostname))
break;
free(lease->hostname);
lease->hostname = hostname;
hostname = NULL;
break;
}
case DHCP_OPTION_ROOT_PATH:
r = lease_parse_string(option, len, &lease->root_path);
if (r < 0)