wireless: fix use-after-free bug

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index 52d0eae..daa4df7 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -495,6 +495,7 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
                wdev = vif_new->wdev;
 
        if (vif_old && vif_new) {
+               vif_old->section = vif_new->section;
                if (blob_attr_equal(vif_old->config, vif_new->config)) {
                        free(vif_new);
                        return;
@@ -604,7 +605,7 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
        wdev->script_check.cb = wireless_device_check_script_tasks;
 }
 
-void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data)
+void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section)
 {
        struct wireless_interface *vif;
        struct blob_attr *tb[__VIF_ATTR_MAX];
@@ -624,6 +625,7 @@ void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *d
        vif->name = strcpy(name_buf, name);
        vif->wdev = wdev;
        vif->config = data;
+       vif->section = section;
        vlist_add(&wdev->interfaces, &vif->node, vif->name);
 }
 
@@ -633,6 +635,10 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
        void *i;
 
        i = blobmsg_open_table(b, iface->name);
+       if (iface->section)
+               blobmsg_add_string(b, "section", iface->section);
+       if (iface->ifname)
+               blobmsg_add_string(b, "ifname", iface->ifname);
        if (iface->data)
                blob_put_raw(b, blob_data(iface->data), blob_len(iface->data));
        blobmsg_close_table(b, i);