[openwrt/openwrt] hostapd: fix a mesh mode crash with CONFIG_TAXONOMY enabled

LEDE Commits lede-commits at lists.infradead.org
Thu May 3 03:38:55 PDT 2018


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/3a456683e5da7ed3a26ffb71e1dbbf1d1db0d036

commit 3a456683e5da7ed3a26ffb71e1dbbf1d1db0d036
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu May 3 12:38:20 2018 +0200

    hostapd: fix a mesh mode crash with CONFIG_TAXONOMY enabled
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...sh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch b/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
new file mode 100644
index 0000000..bbc4672
--- /dev/null
+++ b/package/network/services/hostapd/patches/022-mesh-fix-crash-with-CONFIG_TAXONOMY-enabled.patch
@@ -0,0 +1,23 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Thu, 3 May 2018 12:34:31 +0200
+Subject: [PATCH] mesh: fix crash with CONFIG_TAXONOMY enabled
+
+wpa_s->ifmsh needs to be allocated using hostapd_alloc_iface() instead
+of a direct call to os_zalloc, otherwise the linked list for station
+taxonomy items remains uninitialized, leading to a crash on the first
+attempt to traverse that list
+
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/wpa_supplicant/mesh.c
++++ b/wpa_supplicant/mesh.c
+@@ -216,7 +216,7 @@ static int wpa_supplicant_mesh_init(stru
+ 		return 0;
+ 	}
+ 
+-	wpa_s->ifmsh = ifmsh = os_zalloc(sizeof(*wpa_s->ifmsh));
++	wpa_s->ifmsh = ifmsh = hostapd_alloc_iface();
+ 	if (!ifmsh)
+ 		return -ENOMEM;
+ 



More information about the lede-commits mailing list