netifd: fix resource leak on error in netifd_add_dynamic()

[project/netifd.git] / alias.c

diff --git a/alias.c b/alias.c
index f95c9f5c09ebefabcc2ce6b9fdc4294f60282737..951e046bb3f135b582ca4a371f01f3a647a282ab 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -30,8 +30,6 @@ struct alias_device {
        char name[];
 };
 
-static struct device_type alias_device_type;
-
 static void alias_set_device(struct alias_device *alias, struct device *dev)
 {
        if (dev == alias->dep.dev) {
@@ -89,19 +87,20 @@ alias_device_set_state(struct device *dev, bool state)
 static void alias_device_cb(struct device_user *dep, enum device_event ev)
 {
        struct alias_device *alias;
-       bool new_state = false;
 
        alias = container_of(dep, struct alias_device, dep);
        switch (ev) {
        case DEV_EVENT_ADD:
-               new_state = true;
+               device_set_present(&alias->dev, true);
+               break;
        case DEV_EVENT_REMOVE:
-               device_set_present(&alias->dev, new_state);
+               device_set_present(&alias->dev, false);
                break;
        case DEV_EVENT_LINK_UP:
-               new_state = true;
+               device_set_link(&alias->dev, true);
+               break;
        case DEV_EVENT_LINK_DOWN:
-               device_set_link(&alias->dev, new_state);
+               device_set_link(&alias->dev, false);
                break;
        case DEV_EVENT_UPDATE_IFINDEX:
                device_set_ifindex(&alias->dev, dep->dev->ifindex);
@@ -125,7 +124,11 @@ alias_device_create(const char *name, struct device_type *devtype,
        strcpy(alias->name, name);
        alias->dev.set_state = alias_device_set_state;
        alias->dev.hidden = true;
-       device_init_virtual(&alias->dev, devtype, NULL);
+       if (device_init_virtual(&alias->dev, devtype, NULL) < 0) {
+               free(alias);
+               return NULL;
+       }
+
        alias->avl.key = alias->name;
        avl_insert(&aliases, &alias->avl);
        alias->dep.alias = true;