fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 10:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp/nettools: validate nis-domain option (40) differently

Browse source 
Previously, we would check that all characters are ASCII. But we would
also accept NUL characters (and truncate on the first NUL).

Now:

- reject any NUL characters inside the string (except trailing NUL).

- accept all characters, and if necessary backslash-encode non UTF-8.
This commit is contained in:
Thomas Haller 2021-02-10 11:58:36 +01:00
parent 0c93bff179
commit 6c8a9e8bd6
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/dhcp/nm-dhcp-nettools.c
View file

@ -854,7 +854,6 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
guint16 v_u16; guint16 v_u16;
gboolean v_bool; gboolean v_bool;
int r; int r;
gsize i;
g_return_val_if_fail(lease != NULL, NULL); g_return_val_if_fail(lease != NULL, NULL);
@ -939,22 +938,19 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
} }
r = n_dhcp4_client_lease_query(lease, NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, &l_data, &l_data_len); r = n_dhcp4_client_lease_query(lease, NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, &l_data, &l_data_len);
if (r == 0) { if (r == 0 && nm_dhcp_lease_data_parse_cstr(l_data, l_data_len, &l_data_len)) {
gs_free char *str_free = NULL; gs_free char *to_free = NULL;
for (i = 0; i < l_data_len; i++) { /* https://tools.ietf.org/html/rfc2132#section-8.1 */
if (!nm_is_ascii((char) l_data[i]))
goto nis_domain_done; v_str = nm_utils_buf_utf8safe_escape((char *) l_data, l_data_len, 0, &to_free);
}
v_str = nm_strndup_a(300, (const char *) l_data, l_data_len, &str_free);
nm_dhcp_option_add_option(options, nm_dhcp_option_add_option(options,
_nm_dhcp_option_dhcp4_options, _nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, NM_DHCP_OPTION_DHCP4_NIS_DOMAIN,
v_str); v_str);
nm_ip4_config_set_nis_domain(ip4_config, v_str); nm_ip4_config_set_nis_domain(ip4_config, v_str);
} }
nis_domain_done:
lease_parse_address_list(lease, ip4_config, NM_DHCP_OPTION_DHCP4_NIS_SERVERS, options); lease_parse_address_list(lease, ip4_config, NM_DHCP_OPTION_DHCP4_NIS_SERVERS, options);
lease_parse_address_list(lease, ip4_config, NM_DHCP_OPTION_DHCP4_NETBIOS_NAMESERVER, options); lease_parse_address_list(lease, ip4_config, NM_DHCP_OPTION_DHCP4_NETBIOS_NAMESERVER, options);