fix refcount bugs when dev->set_state fails

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index ce6f175..32fa4a4 100644 (file)
--- a/device.c
+++ b/device.c
@@ -141,8 +141,11 @@ int device_claim(struct device_user *dep)
        ret = dev->set_state(dev, true);
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
-       else
+       else {
+               D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
                dev->active = 0;
+               dep->claimed = false;
+       }
 
        return ret;
 }
@@ -208,7 +211,20 @@ int device_init(struct device *dev, const struct device_type *type, const char *
        return 0;
 }
 
-struct device *device_get(const char *name, bool create)
+static struct device *
+device_create_default(const char *name)
+{
+       struct device *dev;
+
+       D(DEVICE, "Create simple device '%s'\n", name);
+       dev = calloc(1, sizeof(*dev));
+       device_init(dev, &simple_device_type, name);
+       dev->default_config = true;
+       return dev;
+}
+
+struct device *
+device_get(const char *name, bool create)
 {
        struct device *dev;
 
@@ -222,11 +238,7 @@ struct device *device_get(const char *name, bool create)
        if (!create)
                return NULL;
 
-       D(DEVICE, "Create simple device '%s'\n", name);
-       dev = calloc(1, sizeof(*dev));
-       device_init(dev, &simple_device_type, name);
-
-       return dev;
+       return device_create_default(name);
 }
 
 static void
@@ -250,6 +262,7 @@ void device_cleanup(struct device *dev)
                        continue;
 
                dep->cb(dep, DEV_EVENT_REMOVE);
+               device_release(dep);
        }
 
        device_delete(dev);
@@ -279,7 +292,7 @@ void device_add_user(struct device_user *dep, struct device *dev)
 static void
 __device_free_unused(struct device *dev)
 {
-       if (!list_empty(&dev->users))
+       if (!list_empty(&dev->users) || dev->current_config)
                return;
 
        device_free(dev);
@@ -327,6 +340,7 @@ enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
        struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
+       const struct config_param_list *params = dev->type->config_params;
 
        blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
                blob_data(attr), blob_len(attr));
@@ -336,11 +350,14 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
        else
                memset(tb1, 0, sizeof(tb1));
 
-       if (!config_diff(tb, tb1, &device_attr_list, NULL))
+       if (!config_diff(tb, tb1, dev->type->config_params, NULL))
                return DEV_CONFIG_NO_CHANGE;
 
        device_init_settings(dev, tb);
-       return DEV_CONFIG_APPLIED;
+       if (params == &device_attr_list)
+               return DEV_CONFIG_APPLIED;
+       else
+               return DEV_CONFIG_RECREATE;
 }
 
 static enum dev_change_type
@@ -366,8 +383,9 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(odev, false);
 
        list_for_each_entry_safe(dep, tmp, &odev->users, list) {
-               device_remove_user(dep);
-               device_add_user(dep, dev);
+               device_release(dep);
+               list_move_tail(&dep->list, &dev->users);
+               dep->dev = dev;
        }
        device_free(odev);
 
@@ -375,6 +393,32 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(dev, true);
 }
 
+void
+device_reset_config(void)
+{
+       struct device *dev;
+
+       avl_for_each_element(&devices, dev, avl)
+               dev->current_config = false;
+}
+
+void
+device_reset_old(void)
+{
+       struct device *dev, *tmp, *ndev;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (dev->current_config || dev->default_config)
+                       continue;
+
+               if (dev->type != &simple_device_type)
+                       continue;
+
+               ndev = device_create_default(dev->ifname);
+               device_replace(ndev, dev);
+       }
+}
+
 struct device *
 device_create(const char *name, const struct device_type *type,
              struct blob_attr *config)
@@ -389,6 +433,7 @@ device_create(const char *name, const struct device_type *type,
 
        odev = device_get(name, false);
        if (odev) {
+               odev->current_config = true;
                change = device_check_config(odev, type, config);
                switch (change) {
                case DEV_CONFIG_APPLIED:
@@ -399,7 +444,6 @@ device_create(const char *name, const struct device_type *type,
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }
-                       free(config);
                        return odev;
                case DEV_CONFIG_NO_CHANGE:
                        D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
@@ -416,6 +460,7 @@ device_create(const char *name, const struct device_type *type,
        if (!dev)
                return NULL;
 
+       dev->current_config = true;
        dev->config = config;
        if (odev)
                device_replace(dev, odev);