wireless: fix alignment of wireless config structs - fixes segfaults on arm

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index c099a33..5313119 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -40,7 +40,7 @@ enum {
 
 static const struct blobmsg_policy vif_policy[__VIF_ATTR_MAX] = {
        [VIF_ATTR_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
-       [VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_STRING },
+       [VIF_ATTR_NETWORK] = { .name = "network", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static const struct uci_blob_param_list vif_param = {
@@ -57,24 +57,37 @@ put_container(struct blob_buf *buf, struct blob_attr *attr, const char *name)
 }
 
 static void
-vif_config_add_bridge(struct blob_buf *buf, const char *network, bool prepare)
+vif_config_add_bridge(struct blob_buf *buf, struct blob_attr *networks, bool prepare)
 {
        struct interface *iface;
-       struct device *dev;
+       struct device *dev = NULL;
+       struct blob_attr *cur;
+       const char *network;
+       int rem;
 
-       if (!network)
+       if (!networks)
                return;
 
-       iface = vlist_find(&interfaces, network, iface, node);
-       if (!iface)
-               return;
+       blobmsg_for_each_attr(cur, networks, rem) {
+               network = blobmsg_data(cur);
+
+               iface = vlist_find(&interfaces, network, iface, node);
+               if (!iface)
+                       continue;
+
+               dev = iface->main_dev.dev;
+               if (!dev)
+                       return;
+
+               if (dev->type != &bridge_device_type)
+                       return;
+       }
 
-       dev = iface->main_dev.dev;
        if (!dev)
                return;
 
-       if (dev->type != &bridge_device_type)
-               return;
+       if (dev->hotplug_ops && dev->hotplug_ops->prepare)
+               dev->hotplug_ops->prepare(dev);
 
        blobmsg_add_string(buf, "bridge", dev->ifname);
 }
@@ -167,6 +180,8 @@ wireless_device_free_state(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
 
+       uloop_timeout_cancel(&wdev->script_check);
+       uloop_timeout_cancel(&wdev->timeout);
        wireless_complete_kill_request(wdev);
        free(wdev->data);
        wdev->data = NULL;
@@ -180,15 +195,22 @@ wireless_device_free_state(struct wireless_device *wdev)
 static void wireless_interface_handle_link(struct wireless_interface *vif, bool up)
 {
        struct interface *iface;
+       struct blob_attr *cur;
+       const char *network;
+       int rem;
 
        if (!vif->network || !vif->ifname)
                return;
 
-       iface = vlist_find(&interfaces, vif->network, iface, node);
-       if (!iface)
-               return;
+       blobmsg_for_each_attr(cur, vif->network, rem) {
+               network = blobmsg_data(cur);
+
+               iface = vlist_find(&interfaces, network, iface, node);
+               if (!iface)
+                       continue;
 
-       interface_handle_link(iface, vif->ifname, up);
+               interface_handle_link(iface, vif->ifname, up);
+       }
 }
 
 static void
@@ -247,6 +269,33 @@ __wireless_device_set_up(struct wireless_device *wdev)
 }
 
 static void
+wireless_device_free(struct wireless_device *wdev)
+{
+       vlist_flush_all(&wdev->interfaces);
+       avl_delete(&wireless_devices.avl, &wdev->node.avl);
+       free(wdev->config);
+       free(wdev);
+}
+
+static void
+wdev_handle_config_change(struct wireless_device *wdev)
+{
+       enum interface_config_state state = wdev->config_state;
+
+       switch(state) {
+       case IFC_NORMAL:
+       case IFC_RELOAD:
+               wdev->config_state = IFC_NORMAL;
+               if (wdev->autostart)
+                       __wireless_device_set_up(wdev);
+               break;
+       case IFC_REMOVE:
+               wireless_device_free(wdev);
+               break;
+       }
+}
+
+static void
 wireless_device_mark_down(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
@@ -258,11 +307,10 @@ wireless_device_mark_down(struct wireless_device *wdev)
 
        wireless_process_kill_all(wdev, SIGTERM, true);
 
+       wdev->cancel = false;
        wdev->state = IFS_DOWN;
        wireless_device_free_state(wdev);
-
-       if (wdev->autostart)
-               __wireless_device_set_up(wdev);
+       wdev_handle_config_change(wdev);
 }
 
 static void
@@ -312,6 +360,9 @@ __wireless_device_set_down(struct wireless_device *wdev)
 static void
 wireless_device_retry_setup(struct wireless_device *wdev)
 {
+       if (wdev->state == IFS_TEARDOWN || wdev->state == IFS_DOWN || wdev->cancel)
+               return;
+
        if (--wdev->retry < 0)
                wdev->autostart = false;
 
@@ -343,41 +394,12 @@ wireless_device_set_down(struct wireless_device *wdev)
 }
 
 static void
-wireless_device_free(struct wireless_device *wdev)
-{
-    vlist_flush_all(&wdev->interfaces);
-    free(wdev->config);
-    free(wdev);
-}
-
-static void
-wdev_handle_config_change(struct wireless_device *wdev)
-{
-       enum interface_config_state state = wdev->config_state;
-
-       wdev->config_state = IFC_NORMAL;
-       switch(state) {
-       case IFC_NORMAL:
-               break;
-       case IFC_RELOAD:
-               if (wdev->autostart)
-                       __wireless_device_set_up(wdev);
-               break;
-       case IFC_REMOVE:
-               wireless_device_free(wdev);
-               break;
-       }
-}
-
-static void
 wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state s)
 {
-       enum interface_config_state old_state = wdev->config_state;
-
-       wdev->config_state = s;
-       if (old_state != IFC_NORMAL)
+       if (wdev->config_state != IFC_NORMAL)
                return;
 
+       wdev->config_state = s;
        if (wdev->state == IFS_DOWN)
                wdev_handle_config_change(wdev);
        else
@@ -440,10 +462,10 @@ wireless_add_handler(const char *script, const char *name, json_object *obj)
                return;
 
        drv = calloc_a(sizeof(*drv),
-               &name_str, strlen(name) + 1,
-               &script_str, strlen(script) + 1,
                &dev_config, sizeof(*dev_config) + sizeof(void *),
-               &iface_config, sizeof(*iface_config) + sizeof(void *));
+               &iface_config, sizeof(*iface_config) + sizeof(void *),
+               &name_str, strlen(name) + 1,
+               &script_str, strlen(script) + 1);
 
        drv->name = strcpy(name_str, name);
        drv->script = strcpy(script_str, script);
@@ -489,7 +511,7 @@ wireless_interface_init_config(struct wireless_interface *vif)
        blobmsg_parse(vif_policy, __VIF_ATTR_MAX, tb, blob_data(vif->config), blob_len(vif->config));
 
        if ((cur = tb[VIF_ATTR_NETWORK]))
-               vif->network = blobmsg_data(cur);
+               vif->network = cur;
 }
 
 static void
@@ -603,7 +625,6 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
        INIT_LIST_HEAD(&wdev->script_proc);
        vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
        wdev->interfaces.keep_old = true;
-       wdev->interfaces.no_delete = true;
        vlist_add(&wireless_devices, &wdev->node, wdev->name);
 
        wdev->timeout.cb = wireless_device_setup_timeout;
@@ -646,7 +667,7 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
 {
        void *i;
 
-       i = blobmsg_open_table(b, iface->name);
+       i = blobmsg_open_table(b, NULL);
        if (iface->section)
                blobmsg_add_string(b, "section", iface->section);
        if (iface->ifname)
@@ -666,10 +687,10 @@ wireless_device_status(struct wireless_device *wdev, struct blob_buf *b)
        blobmsg_add_u8(b, "up", wdev->state == IFS_UP);
        blobmsg_add_u8(b, "pending", wdev->state == IFS_SETUP || wdev->state == IFS_TEARDOWN);
        blobmsg_add_u8(b, "autostart", wdev->autostart);
-       i = blobmsg_open_table(b, "interfaces");
+       i = blobmsg_open_array(b, "interfaces");
        vlist_for_each_element(&wdev->interfaces, iface, node)
                wireless_interface_status(iface, b);
-       blobmsg_close_table(b, i);
+       blobmsg_close_array(b, i);
        blobmsg_close_table(b, c);
 }