fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 03:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: in find_virtual_interface_name() ensure return value stays alive

Browse source 
It's not clear that the returned string is still valid after we
unref the GVariant that contains it. Also return the reference to
the variant.
This commit is contained in:
Thomas Haller 2020-02-17 16:29:25 +01:00
parent f3dd41ad7e
commit 74e2203e19
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnm-core/nm-setting-connection.c
View file

@ -1251,11 +1251,14 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
}
static const char *
find_virtual_interface_name (GVariant *connection_dict)
find_virtual_interface_name (GVariant *connection_dict,
GVariant **variant_to_free)
{
GVariant *setting_dict;
const char *interface_name;
nm_assert (variant_to_free && !*variant_to_free);
setting_dict = g_variant_lookup_value (connection_dict, NM_SETTING_BOND_SETTING_NAME, NM_VARIANT_TYPE_SETTING);
if (!setting_dict)
setting_dict = g_variant_lookup_value (connection_dict, NM_SETTING_BRIDGE_SETTING_NAME, NM_VARIANT_TYPE_SETTING);
@ -1267,11 +1270,12 @@ find_virtual_interface_name (GVariant *connection_dict)
if (!setting_dict)
return NULL;
*variant_to_free = setting_dict;
/* All of the deprecated virtual interface name properties were named "interface-name". */
if (!g_variant_lookup (setting_dict, "interface-name", "&s", &interface_name))
interface_name = NULL;
g_variant_unref (setting_dict);
return interface_name;
}
@ -1284,12 +1288,13 @@ nm_setting_connection_set_interface_name (NMSetting *setting,
GError **error)
{
const char *interface_name;
gs_unref_variant GVariant *variant_to_free = NULL;
/* For compatibility reasons, if there is an invalid virtual interface name,
* we need to make verification fail, even if that virtual name would be
* overridden by a valid connection.interface-name.
*/
interface_name = find_virtual_interface_name (connection_dict);
interface_name = find_virtual_interface_name (connection_dict, &variant_to_free);
if (!interface_name || nm_utils_ifname_valid_kernel (interface_name, NULL))
interface_name = g_variant_get_string (value, NULL);
@ -1308,8 +1313,9 @@ nm_setting_connection_no_interface_name (NMSetting *setting,
GError **error)
{
const char *virtual_interface_name;
gs_unref_variant GVariant *variant_to_free = NULL;
virtual_interface_name = find_virtual_interface_name (connection_dict);
virtual_interface_name = find_virtual_interface_name (connection_dict, &variant_to_free);
g_object_set (G_OBJECT (setting),
NM_SETTING_CONNECTION_INTERFACE_NAME, virtual_interface_name,
NULL);