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

ifcfg: fix crash due to not setting error on failure to parse DNS

Browse source 
Fixes: c2ad294290 ('ifcfg-rh: fix error handing in some functions that expect error != NULL')
(cherry picked from commit 1abf512831)
This commit is contained in:
Thomas Haller 2021-08-16 23:29:46 +02:00 • committed by Beniamino Galvani
parent 08800329e7
commit 722c7805e4
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1987,7 +1987,11 @@ make_ip4_setting(shvarFile *ifcfg,
} else if (nm_utils_ipaddr_is_valid(AF_INET6, v)) {
/* Ignore IPv6 addresses */
} else {
PARSE_WARNING("invalid DNS server address %s", v);
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid DNS server address '%s'",
v);
return NULL;
}
}
@ -2510,7 +2514,11 @@ make_ip6_setting(shvarFile *ifcfg, shvarFile *network_ifcfg, gboolean routes_rea
} else if (nm_utils_ipaddr_is_valid(AF_INET, v)) {
/* Ignore IPv4 addresses */
} else {
PARSE_WARNING("invalid DNS server address %s", v);
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid DNS server address '%s'",
v);
return NULL;
}
}