netifd: Fix device ifindex overwrite when processing netlink event messages

When a device with the same name is deleted and created again in the kernel
the ifindex changes.
A race condition will occur when netlink event messages linked to the old device
are processed and will thus overwrite the correct ifindex of the new device.
Further make sure a valid ifindex is in place for both external and internal
devices when setting the state to enabled.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/device.c b/device.c
index b29d73b122704206b95325228b84900b12bda562..5d1dcacd6f17901ddc47395d092436d42b7ac292 100644 (file)
--- a/device.c
+++ b/device.c
@@ -62,6 +62,14 @@ void device_unlock(void)
 
 static int set_device_state(struct device *dev, bool state)
 {
+       if (state) {
+               /* Set ifindex for all devices being enabled so a valid  */
+               /* ifindex is in place avoiding possible race conditions */
+               device_set_ifindex(dev, system_if_resolve(dev));
+               if (!dev->ifindex)
+                       return -1;
+       }
+
        if (dev->external)
                return 0;
 

diff --git a/system-dummy.c b/system-dummy.c
index 8e420e124b3aed3569aedc394c0eab9ecc177bdd..7d543159cf54ac99abb909e17ebd5c8483f5e1a0 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -96,6 +96,11 @@ int system_if_check(struct device *dev)
        return 0;
 }
 
+int system_if_resolve(struct device *dev)
+{
+       return 0;
+}
+
 struct device *
 system_if_get_parent(struct device *dev)
 {

diff --git a/system-linux.c b/system-linux.c
index 02574fcbeea6f5ab77ad0493c0ccb7d3840d9366..6a6028c7e64ce3be76ecad022d4feb21396e4565 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -316,11 +316,7 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg)
                goto out;
 
        struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false);
-       if (!dev)
-               goto out;
-
-       device_set_ifindex(dev, ifi->ifi_index);
-       if (dev->type->keep_link_status)
+       if (!dev || dev->type->keep_link_status)
                goto out;
 
        if (!system_get_dev_sysctl("/sys/class/net/%s/carrier", dev->ifname, buf, sizeof(buf)))
@@ -497,7 +493,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
        return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL);
 }
 
-static int system_if_resolve(struct device *dev)
+int system_if_resolve(struct device *dev)
 {
        struct ifreq ifr;
        strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name));
@@ -1006,7 +1002,6 @@ int system_if_up(struct device *dev)
 {
        system_if_get_settings(dev, &dev->orig_settings);
        system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
-       device_set_ifindex(dev, system_if_resolve(dev));
        return system_if_flags(dev->ifname, IFF_UP, 0);
 }
 

diff --git a/system.h b/system.h
index b1215d13bb361b8a51f8c43db065b9b6ea071290..3bf6f9782799de60f790b6a507a86503ad71749e 100644 (file)
--- a/system.h
+++ b/system.h
@@ -116,6 +116,8 @@ void system_if_clear_state(struct device *dev);
 int system_if_up(struct device *dev);
 int system_if_down(struct device *dev);
 int system_if_check(struct device *dev);
+int system_if_resolve(struct device *dev);
+
 int system_if_dump_info(struct device *dev, struct blob_buf *b);
 int system_if_dump_stats(struct device *dev, struct blob_buf *b);
 struct device *system_if_get_parent(struct device *dev);