netifd: fix resource leak on error in netifd_add_dynamic()

[oweals/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index 221c79c8694e9fa00558e12502f585df37a2e428..8748b3040d511f554ec335071f39b4b0a120df63 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -61,7 +61,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
        return ret;
 }
 
-static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
+static int vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
 {
        char *name;
 
@@ -69,7 +69,7 @@ static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
        vldev->dev.hidden = dev->hidden;
        sprintf(name, "%s.%d", dev->ifname, vldev->id);
 
-       device_set_ifname(&vldev->dev, name);
+       return device_set_ifname(&vldev->dev, name);
 }
 
 static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
@@ -85,7 +85,8 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
                device_set_present(&vldev->dev, false);
                break;
        case DEV_EVENT_UPDATE_IFNAME:
-               vlan_dev_set_name(vldev, dep->dev);
+               if (vlan_dev_set_name(vldev, dep->dev) < 0)
+                       free_vlan_if(&vldev->dev);
                break;
        case DEV_EVENT_TOPO_CHANGE:
                /* Propagate topo changes */
@@ -129,9 +130,12 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
 
        vldev->id = id;
 
-       device_init(&vldev->dev, &vlan_type, NULL);
+       if (device_init(&vldev->dev, &vlan_type, NULL) < 0)
+               goto error;
+
+       if (vlan_dev_set_name(vldev, dev) < 0)
+               goto error;
 
-       vlan_dev_set_name(vldev, dev);
        vldev->dev.default_config = true;
 
        vldev->set_state = vldev->dev.set_state;
@@ -141,6 +145,11 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        device_add_user(&vldev->dep, dev);
 
        return &vldev->dev;
+
+error:
+       device_cleanup(&vldev->dev);
+       free(vldev);
+       return NULL;
 }
 
 static char *split_vlan(char *s)