fix device_lock/device_unlock imbalances

diff --git a/alias.c b/alias.c
index 07ed5fea1d15cccd0236428c457c72b51829ce7e..72018d4d26de70072f76d761369a86da926df934 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -108,7 +108,7 @@ alias_notify_device(const char *name, struct device *dev)
 
        alias = avl_find_element(&aliases, name, alias, avl);
        if (!alias)
-               return;
+               goto out;
 
        alias->cleanup = !dev;
        if (dev) {
@@ -128,6 +128,7 @@ alias_notify_device(const char *name, struct device *dev)
                device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
        }
 
+out:
        device_unlock();
 }
 

diff --git a/ubus.c b/ubus.c
index be9e63221077786867c263587c1f62e7d1d4a515..3ea71bf8e40946c29f450110eca0cc5ede3ca577 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -595,8 +595,10 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
        device_lock();
 
        dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
-       if (add && !dev)
-               return UBUS_STATUS_NOT_FOUND;
+       if (add && !dev) {
+               ret = UBUS_STATUS_NOT_FOUND;
+               goto out;
+       }
 
        if (add) {
                device_set_present(dev, true);
@@ -609,6 +611,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
                ret = interface_remove_link(iface, dev);
        }
 
+out:
        device_unlock();
 
        return ret;