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

device: update @ip_iface only if IP interface exists

Browse source 
If @ip_ifindex is zero, the IP interface has disappeared and
there's no point in updating @ip_iface.

Actually, unconditionally updating @ip_iface is dangerous because it
breaks the assumption used by other functions (as
nm_device_get_ip_ifindex()) that a non-NULL @ip_iface implies a valid
@ip_ifindex. This was causing the scary failure:

  devices/nm-device.c:666:get_ip_iface_identifier: assertion failed: (ifindex)

https://bugzilla.redhat.com/show_bug.cgi?id=1268617
(cherry picked from commit ed536998f9)
This commit is contained in:
Beniamino Galvani 2016-01-04 14:22:01 +01:00
parent 8204c2a196
commit cbcb848e6d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/devices/nm-device.c
View file

@ -1526,12 +1526,13 @@ device_ip_link_changed (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const NMPlatformLink *pllink;
int ip_ifindex;
priv->device_ip_link_changed_id = 0;
ip_ifindex = nm_device_get_ip_ifindex (self);
pllink = nm_platform_link_get (NM_PLATFORM_GET, ip_ifindex);
if (!priv->ip_ifindex)
return G_SOURCE_REMOVE;
pllink = nm_platform_link_get (NM_PLATFORM_GET, priv->ip_ifindex);
if (!pllink)
return G_SOURCE_REMOVE;