colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: rework error handling in parse_infiniband_p_key()

Browse Source
This commit is contained in:
Thomas Haller
2022-09-02 21:15:57 +02:00
committed by Wen Liang
parent 4c32dd9d25
commit 61d74b0c15
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View File

@@ -5355,43 +5355,41 @@ wired_connection_from_ifcfg(const char *file, shvarFile *ifcfg, GError **error)
static gboolean
parse_infiniband_p_key(shvarFile *ifcfg, int *out_p_key, char **out_parent, GError **error)
{
char *physdev = NULL, *pkey_id = NULL;
gs_free char *physdev = NULL;
gs_free char *pkey_id = NULL;
int id;
gboolean ret = FALSE;
physdev = svGetValueStr_cp(ifcfg, "PHYSDEV");
if (!physdev) {
PARSE_WARNING("InfiniBand connection specified PKEY but not PHYSDEV");
goto done;
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"infiniband connection specified PKEY but not PHYSDEV");
return FALSE;
}
pkey_id = svGetValueStr_cp(ifcfg, "PKEY_ID");
if (!pkey_id) {
PARSE_WARNING("InfiniBand connection specified PKEY but not PKEY_ID");
goto done;
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"infiniband connection specified PKEY but not PKEY_ID");
return FALSE;
}
id = _nm_utils_ascii_str_to_int64(pkey_id, 0, 0, 0xFFFF, -1);
if (id == -1) {
PARSE_WARNING("invalid InfiniBand PKEY_ID '%s'", pkey_id);
goto done;
}
*out_p_key = id;
*out_parent = g_strdup(physdev);
ret = TRUE;
done:
g_free(physdev);
g_free(pkey_id);
if (!ret) {
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Failed to create InfiniBand setting");
"invalid infiniband PKEY_ID '%s'",
pkey_id);
return FALSE;
}
return ret;
*out_p_key = id;
*out_parent = g_steal_pointer(&physdev);
return TRUE;
}
static NMSetting *