fix refcount bugs when dev->set_state fails

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 62617e2..9454dc1 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -31,7 +31,7 @@ const struct config_param_list interface_attr_list = {
 };
 
 static void
-clear_interface_errors(struct interface *iface)
+interface_clear_errors(struct interface *iface)
 {
        struct interface_error *error, *tmp;
 
@@ -119,7 +119,7 @@ __interface_set_up(struct interface *iface)
 static void
 __interface_set_down(struct interface *iface, bool force)
 {
-       clear_interface_errors(iface);
+       interface_clear_errors(iface);
 
        if (iface->state == IFS_DOWN ||
                iface->state == IFS_TEARDOWN)
@@ -184,6 +184,7 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+       interface_clear_errors(iface);
        if (iface->main_dev.dev)
                device_remove_user(&iface->main_dev);
        interface_set_proto_state(iface, NULL);
@@ -308,11 +309,9 @@ interface_add(struct interface *iface, struct blob_attr *config)
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(config), blob_len(config));
 
-       if ((cur = tb[IFACE_ATTR_IFNAME])) {
+       if ((cur = tb[IFACE_ATTR_IFNAME]))
                iface->ifname = blobmsg_data(cur);
 
-       }
-
        iface->config = config;
        vlist_add(&interfaces, &iface->node);
 }
@@ -394,7 +393,7 @@ set_config_state(struct interface *iface, enum interface_config_state s)
        if (iface->state == IFS_DOWN)
                interface_handle_config_change(iface);
        else
-               interface_set_down(iface);
+               __interface_set_down(iface, false);
 }
 
 static void
@@ -402,6 +401,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 {
        struct blob_attr *old_config = if_old->config;
 
+       interface_clear_errors(if_old);
        if_old->config = if_new->config;
        if (!if_old->config_autostart && if_new->config_autostart)
                if_old->autostart = true;