fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 01:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: don't assert for valid ifindex in nm_platform_link_get()

Browse source 
It's not uncommon to lookup a platform parameter with invalid
ifindex or ifname. Be more resilient and just return "no link found".

Fixes: e8e455817b
This commit is contained in:
Thomas Haller 2015-06-21 15:05:52 +02:00
parent e8e455817b
commit 0a38352470
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/platform/nm-platform.c
View file

@ -500,9 +500,9 @@ nm_platform_link_get (NMPlatform *self, int ifindex)
{
_CHECK_SELF (self, klass, NULL);
g_return_val_if_fail (ifindex > 0, NULL);
return klass->link_get (self, ifindex);
if (ifindex > 0)
return klass->link_get (self, ifindex);
return NULL;
}
/**
@ -517,9 +517,9 @@ nm_platform_link_get_by_ifname (NMPlatform *self, const char *ifname)
{
_CHECK_SELF (self, klass, NULL);
g_return_val_if_fail (ifname && *ifname, NULL);
return klass->link_get_by_ifname (self, ifname);
if (ifname && *ifname)
return klass->link_get_by_ifname (self, ifname);
return NULL;
}
/**
@ -538,10 +538,13 @@ nm_platform_link_get_by_address (NMPlatform *self,
{
_CHECK_SELF (self, klass, NULL);
g_return_val_if_fail (address != NULL, NULL);
g_return_val_if_fail (length > 0, NULL);
return klass->link_get_by_address (self, address, length);
g_return_val_if_fail (length == 0 || address, NULL);
if (length > 0) {
if (length > NM_UTILS_HWADDR_LEN_MAX)
g_return_val_if_reached (NULL);
return klass->link_get_by_address (self, address, length);
}
return NULL;
}
static NMPlatformError
@ -639,8 +642,6 @@ nm_platform_link_delete (NMPlatform *self, int ifindex)
_CHECK_SELF (self, klass, FALSE);
if (ifindex <= 0)
return FALSE;
pllink = nm_platform_link_get (self, ifindex);
if (!pllink)
return FALSE;