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

device: don't use g_warning for differing hw-addr-len after reading permanent address

Browse Source 
Accessing the platform cache might anytime yield unexpected results.
E.g. the link could be gone, or the ifindex could even be replaced
by a different interface (yes, that can happen when moving links
between network namespaces).

It's not clear how to handle such a case at runtime. It seems wrong to
me to just error out. Still, such case might happen under normal
conditions, so it's wrong to just warn and proceed.
This commit is contained in:
Thomas Haller
2016-05-20 10:09:39 +02:00
parent fa5230e255
commit e92b743ce9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/nm-device.c
View File

@@ -11391,15 +11391,20 @@ nm_device_update_initial_hw_address (NMDevice *self)
if (priv->ifindex > 0) {
guint8 buf[NM_UTILS_HWADDR_LEN_MAX];
size_t len = 0;
gboolean success_read;
if (nm_platform_link_get_permanent_address (NM_PLATFORM_GET, priv->ifindex, buf, &len)) {
g_warn_if_fail (len == priv->hw_addr_len);
success_read = nm_platform_link_get_permanent_address (NM_PLATFORM_GET, priv->ifindex, buf, &len);
if (success_read && len == priv->hw_addr_len) {
priv->perm_hw_addr = nm_utils_hwaddr_ntoa (buf, priv->hw_addr_len);
_LOGD (LOGD_DEVICE | LOGD_HW, "read permanent MAC address %s",
priv->perm_hw_addr);
} else {
/* Fall back to current address */
_LOGD (LOGD_HW | LOGD_ETHER, "unable to read permanent MAC address");
_LOGD (LOGD_HW | LOGD_ETHER, "%s",
success_read
? "unable to read permanent MAC address"
: "read HW addr length of permanent MAC address differs");
priv->perm_hw_addr = g_strdup (priv->hw_addr);
}
}