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

initrd: don't add empty connection if iBFT parsing fails

Browse source 
Don't add an empty connection to the list if
nmi_ibft_update_connection_from_nic() fails when reading iBFT
information.

If the function fails in parse_ip(), continue with the existing
connection built from other command line options.

Also, fix a memory leak.
This commit is contained in:
Beniamino Galvani 2020-03-25 18:34:01 +01:00
parent 2da77547ba
commit d0e0213a08
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/initrd/nmi-cmdline-reader.c
View file

@ -198,7 +198,7 @@ static void
read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
{
gs_unref_hashtable GHashTable *ibft = NULL;
NMConnection *connection;
NMConnection *dt_connection;
GHashTableIter iter;
const char *mac;
GHashTable *nic;
@ -209,8 +209,9 @@ read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
g_hash_table_iter_init (&iter, ibft);
while (g_hash_table_iter_next (&iter, (gpointer *) &mac, (gpointer *) &nic)) {
connection = nm_simple_connection_new ();
gs_unref_object NMConnection *connection = NULL;
connection = nm_simple_connection_new ();
index = g_hash_table_lookup (nic, "index");
if (!index) {
_LOGW (LOGD_CORE, "Ignoring an iBFT entry without an index");
@ -220,18 +221,19 @@ read_all_connections_from_fw (GHashTable *connections, const char *sysfs_dir)
if (!nmi_ibft_update_connection_from_nic (connection, nic, &error)) {
_LOGW (LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
g_error_free (error);
continue;
}
g_hash_table_insert (connections,
g_strdup_printf ("ibft%s", index),
connection);
g_steal_pointer (&connection));
}
connection = nmi_dt_reader_parse (sysfs_dir);
if (connection) {
dt_connection = nmi_dt_reader_parse (sysfs_dir);
if (dt_connection) {
g_hash_table_insert (connections,
g_strdup ("ofw"),
connection);
dt_connection);
}
}