system-linux: fix memory leak in system_bridge_vlan_check

[project/netifd.git] / tunnel.c

diff --git a/tunnel.c b/tunnel.c
index 32f361342fe605586fd22cf6c9590edd62480643..6d192ac8509423f4b4ac23a38295c0079880d154 100644 (file)
--- a/tunnel.c
+++ b/tunnel.c
@@ -28,14 +28,14 @@ tunnel_set_state(struct device *dev, bool up)
        int ret;
 
        if (up) {
-               ret = system_add_ip_tunnel(dev->ifname, dev->config);
+               ret = system_add_ip_tunnel(dev, dev->config);
                if (ret != 0)
                        return ret;
        }
 
        ret = tun->set_state(dev, up);
        if (ret || !up)
-               system_del_ip_tunnel(dev->ifname, dev->config);
+               system_del_ip_tunnel(dev);
 
        return ret;
 }
@@ -72,7 +72,13 @@ tunnel_create(const char *name, struct device_type *devtype,
                return NULL;
 
        dev = &tun->dev;
-       device_init(dev, devtype, name);
+
+       if (device_init(dev, devtype, name) < 0) {
+               device_cleanup(dev);
+               free(tun);
+               return NULL;
+       }
+
        tun->set_state = dev->set_state;
        dev->set_state = tunnel_set_state;
        device_apply_config(dev, devtype, attr);
@@ -90,7 +96,7 @@ tunnel_free(struct device *dev)
 }
 
 struct device_type tunnel_device_type = {
-       .name = "IP tunnel",
+       .name = "tunnel",
        .config_params = &tunnel_attr_list,
        .reload = tunnel_reload,
        .create = tunnel_create,