fix refcount bugs when dev->set_state fails

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index ccf66d7..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;
 }
@@ -259,6 +262,7 @@ void device_cleanup(struct device *dev)
                        continue;
 
                dep->cb(dep, DEV_EVENT_REMOVE);
+               device_release(dep);
        }
 
        device_delete(dev);
@@ -336,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));
@@ -345,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
@@ -375,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);