aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorJesus Fernandez Manzano <jesus.manzano@galgus.net>2021-09-21 12:49:30 +0200
committerDavid Bauer <mail@david-bauer.net>2021-09-24 12:33:33 +0200
commit3a051a234a63e1c61510e170a0bf0c89fdf1518c (patch)
treeee3642e51f4bb1ea9fbfb16f9de32a2fd3140499 /package/network/services
parent5c904bcb37374d1d5f26dcb7878f869c15ad2082 (diff)
downloadupstream-3a051a234a63e1c61510e170a0bf0c89fdf1518c.tar.gz
upstream-3a051a234a63e1c61510e170a0bf0c89fdf1518c.tar.bz2
upstream-3a051a234a63e1c61510e170a0bf0c89fdf1518c.zip
hostapd: fix segfault when deinit mesh ifaces
In hostapd_ubus_add_bss(), ubus objects are not registered for mesh interfaces. This provokes a segfault when accessing the ubus object in mesh deinit. This commit adds the same condition to hostapd_ubus_free_bss() for discarding those mesh interfaces. Signed-off-by: Jesus Fernandez Manzano <jesus.manzano@galgus.net> (cherry picked from commit 5269c47e8db549695ceaf6a19afdd0cb90074622)
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/hostapd/src/src/ap/ubus.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c
index d03b848f94..0575fe2572 100644
--- a/package/network/services/hostapd/src/src/ap/ubus.c
+++ b/package/network/services/hostapd/src/src/ap/ubus.c
@@ -1351,6 +1351,11 @@ void hostapd_ubus_free_bss(struct hostapd_data *hapd)
struct ubus_object *obj = &hapd->ubus.obj;
char *name = (char *) obj->name;
+#ifdef CONFIG_MESH
+ if (hapd->conf->mesh & MESH_ENABLED)
+ return;
+#endif
+
if (!ctx)
return;