vlan: Fix possible segfault

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index f70420a..ac434ce 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -50,7 +50,7 @@ static int vlan_set_device_state(struct device *dev, bool up)
        }
 
        ret = device_claim(&vldev->dep);
-       if (ret)
+       if (ret < 0)
                return ret;
 
        system_vlan_add(vldev->dep.dev, vldev->id);
@@ -70,19 +70,23 @@ static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
 static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 {
        struct vlan_device *vldev;
+       bool new_state = false;
 
        vldev = container_of(dep, struct vlan_device, dep);
        switch(ev) {
        case DEV_EVENT_ADD:
-               device_set_present(&vldev->dev, true);
-               break;
+               new_state = true;
        case DEV_EVENT_REMOVE:
-               device_set_present(&vldev->dev, false);
+               device_set_present(&vldev->dev, new_state);
                break;
        case DEV_EVENT_UPDATE_IFNAME:
                vlan_dev_set_name(vldev, dep->dev);
                device_broadcast_event(&vldev->dev, ev);
                break;
+       case DEV_EVENT_TOPO_CHANGE:
+               /* Propagate topo changes */
+               device_broadcast_event(&vldev->dev, DEV_EVENT_TOPO_CHANGE);
+               break;
        default:
                break;
        }
@@ -113,12 +117,16 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        if (!create)
                return NULL;
 
+       D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id);
+
        vldev = calloc(1, sizeof(*vldev));
+       if (!vldev)
+               return NULL;
 
        vldev->id = id;
        vlan_dev_set_name(vldev, dev);
 
-       device_init_virtual(&vldev->dev, &vlan_type, NULL);
+       device_init(&vldev->dev, &vlan_type, vldev->dev.ifname);
        vldev->dev.default_config = true;
 
        vldev->set_state = vldev->dev.set_state;