interface-ip: Fix possbile segfaults

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 4a8db70..65183f3 100644 (file)
--- a/device.c
+++ b/device.c
@@ -74,18 +74,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  */
+               /* Get 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;
 
-       if (state)
                system_if_up(dev);
+       }
        else
                system_if_down(dev);
 
@@ -178,7 +174,7 @@ device_merge_settings(struct device *dev, struct device_settings *n)
                s->dadtransmits : os->dadtransmits;
        n->multicast_to_unicast = s->multicast_to_unicast;
        n->multicast_router = s->multicast_router;
-       n->flags = s->flags | os->flags;
+       n->flags = s->flags | os->flags | os->valid_flags;
 }
 
 void
@@ -324,7 +320,7 @@ void device_broadcast_event(struct device *dev, enum device_event ev)
 int device_claim(struct device_user *dep)
 {
        struct device *dev = dep->dev;
-       int ret;
+       int ret = 0;
 
        if (dep->claimed)
                return 0;
@@ -335,7 +331,17 @@ int device_claim(struct device_user *dep)
                return 0;
 
        device_broadcast_event(dev, DEV_EVENT_SETUP);
-       ret = dev->set_state(dev, true);
+       if (dev->external) {
+               /* Get ifindex for external claimed devices so a valid   */
+               /* ifindex is in place avoiding possible race conditions */
+               device_set_ifindex(dev, system_if_resolve(dev));
+               if (!dev->ifindex)
+                       ret = -1;
+
+               system_if_get_settings(dev, &dev->orig_settings);
+       } else
+               ret = dev->set_state(dev, true);
+
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
        else {
@@ -423,6 +429,9 @@ device_create_default(const char *name, bool external)
 
        D(DEVICE, "Create simple device '%s'\n", name);
        dev = calloc(1, sizeof(*dev));
+       if (!dev)
+               return NULL;
+
        dev->external = external;
        dev->set_state = simple_device_set_state;
        device_init(dev, &simple_device_type, name);
@@ -446,6 +455,7 @@ device_get(const char *name, int create)
        dev = avl_find_element(&devices, name, dev, avl);
        if (dev) {
                if (create > 1 && !dev->external) {
+                       system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
                        dev->external = true;
                        device_set_present(dev, true);
                }