fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 17:40:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp/nettools: validate root-path option (17) to not contain any NUL characters

Browse source 
And make it UTF-8 (by backslash escaping).
This commit is contained in:
Thomas Haller 2021-02-10 11:58:36 +01:00
parent f2885cdf02
commit 0ef37431cf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -928,11 +928,22 @@ lease_to_ip4_config(NMDedupMultiIndex *multi_idx,
lease_parse_ntps(lease, options);
r = n_dhcp4_client_lease_query(lease, NM_DHCP_OPTION_DHCP4_ROOT_PATH, &l_data, &l_data_len);
if (r == 0) {
nm_dhcp_option_add_option(options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_ROOT_PATH,
g_strndup((char *) l_data, l_data_len));
if (r == 0 && nm_dhcp_lease_data_parse_cstr(l_data, l_data_len, &l_data_len)) {
/* https://tools.ietf.org/html/rfc2132#section-3.19
*
* The path is formatted as a character string consisting of
* characters from the NVT ASCII character set.
*
* We still accept any character set and backslash escape it! */
if (l_data_len == 0) {
/* "Its minimum length is 1." */
} else {
nm_dhcp_option_add_option_utf8safe_escape(options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_ROOT_PATH,
l_data,
l_data_len);
}
}
r = n_dhcp4_client_lease_query(lease,