This reverts commit 2564184440d9d6041d11a8c7d50b31368634c3bd.
commit 2564184440d9d6041d11a8c7d50b31368634c3bd 'mesh: Apply
channel attributes before setup interface' causes memory
leakage of auto test mesh_secure_ocv_mix_legacy.
Signed-off-by: Masashi Honma <masashi.honma@xxxxxxxxx>
1547503051.691083: MEMLEAK[0x5608c269a520]: len 200
1547503051.691090: WPA_TRACE: memleak - START
1547503051.691502: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8a) [0x5608c1407dfa]
1547503051.691509: os_malloc() ../src/utils/os_unix.c:702
1547503051.691512: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_zalloc+0x9) [0x5608c1408369]
1547503051.691515: os_zalloc() ../src/utils/os_unix.c:761
1547503051.691518: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(pmksa_cache_auth_create_entry+0x76) [0x5608c1524676]
1547503051.691521: pmksa_cache_auth_create_entry() ../src/ap/pmksa_cache_auth.c:330
1547503051.691524: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(pmksa_cache_auth_add+0x34) [0x5608c1524994]
1547503051.691527: pmksa_cache_auth_add() ../src/ap/pmksa_cache_auth.c:291
1547503051.691530: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_auth_pmksa_add_sae+0x3f) [0x5608c1521a4f]
1547503051.691533: wpa_auth_pmksa_add_sae() ../src/ap/wpa_auth.c:4253
1547503051.691537: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x15d9bb) [0x5608c15009bb]
1547503051.691541: sae_sm_step() ../src/ap/ieee802_11.c:807
1547503051.691544: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x15f7d5) [0x5608c15027d5]
1547503051.691548: handle_auth_sae() ../src/ap/ieee802_11.c:1086
1547503051.691550: handle_auth() ../src/ap/ieee802_11.c:2124
1547503051.691552: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(ieee802_11_mgmt+0x41c) [0x5608c1505bec]
1547503051.691555: ieee802_11_mgmt() ../src/ap/ieee802_11.c:4200
1547503051.691559: [8]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(mesh_mpm_mgmt_rx+0x47) [0x5608c1414a87]
1547503051.691562: mesh_mpm_mgmt_rx() mesh_mpm.c:830
1547503051.691566: [9]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_event+0x200d) [0x5608c15883bd]
1547503051.691569: wpa_supplicant_event() events.c:4541
1547503051.691573: [10]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x2030cd) [0x5608c15a60cd]
1547503051.691576: mlme_event_mgmt() ../src/drivers/driver_nl80211_event.c:661
1547503051.691579: [11]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(process_bss_event+0x24e) [0x5608c15a935e]
1547503051.691583: process_bss_event() ../src/drivers/driver_nl80211_event.c:2652
1547503051.691585: [12]: /lib/x86_64-linux-gnu/libnl-3.so.200(nl_recvmsgs_report+0x3cc) [0x7f05accafc1c]
1547503051.691587: [13]: /lib/x86_64-linux-gnu/libnl-3.so.200(nl_recvmsgs+0x9) [0x7f05accb0049]
1547503051.691590: [14]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x1ed3aa) [0x5608c15903aa]
1547503051.691594: wpa_driver_nl80211_event_receive() ../src/drivers/driver_nl80211.c:1615
1547503051.691597: [15]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x667cf) [0x5608c14097cf]
1547503051.691601: eloop_sock_table_dispatch() ../src/utils/eloop.c:603
1547503051.691602: WPA_TRACE: memleak - END
1547503051.691604: MEMLEAK[0x5608c2677e60]: len 1056
1547503051.691606: WPA_TRACE: memleak - START
1547503051.691854: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8a) [0x5608c1407dfa]
1547503051.691858: os_malloc() ../src/utils/os_unix.c:702
1547503051.691861: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_zalloc+0x9) [0x5608c1408369]
1547503051.691864: os_zalloc() ../src/utils/os_unix.c:761
1547503051.691867: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(pmksa_cache_auth_init+0x16) [0x5608c1524d16]
1547503051.691870: pmksa_cache_auth_init() ../src/ap/pmksa_cache_auth.c:541
1547503051.691873: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_init+0xbe) [0x5608c151ccde]
1547503051.691876: wpa_init() ../src/ap/wpa_auth.c:445
1547503051.691879: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x728a2) [0x5608c14158a2]
1547503051.691882: __mesh_rsn_auth_init() mesh_rsn.c:176
1547503051.691885: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(mesh_rsn_auth_init+0x7d) [0x5608c1415b1d]
1547503051.691888: mesh_rsn_auth_init() mesh_rsn.c:245
1547503051.691892: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_join_mesh+0x67b) [0x5608c1411ecb]
1547503051.691895: wpas_mesh_init_rsn() mesh.c:189
1547503051.691897: wpas_mesh_complete() mesh.c:207
1547503051.691898: wpa_supplicant_join_mesh() mesh.c:527
1547503051.691901: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_associate+0x127) [0x5608c157d9c7]
1547503051.691905: wpa_supplicant_associate() wpa_supplicant.c:1992
1547503051.691908: [8]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x1eb179) [0x5608c158e179]
1547503051.691911: wpa_supplicant_scan() scan.c:928
1547503051.691915: [9]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(eloop_run+0x214) [0x5608c140a2a4]
1547503051.691918: eloop_run() ../src/utils/eloop.c:1196
1547503051.691921: [10]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_run+0x7b) [0x5608c15799cb]
1547503051.691925: wpa_supplicant_run() wpa_supplicant.c:6419
1547503051.691928: [11]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(main+0x402) [0x5608c13f3f82]
1547503051.691932: main() main.c:392
1547503051.691934: WPA_TRACE: memleak - END
1547503051.691935: MEMLEAK[0x5608c2677c80]: len 296
1547503051.691937: WPA_TRACE: memleak - START
1547503051.692178: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8a) [0x5608c1407dfa]
1547503051.692183: os_malloc() ../src/utils/os_unix.c:702
1547503051.692186: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_zalloc+0x9) [0x5608c1408369]
1547503051.692189: os_zalloc() ../src/utils/os_unix.c:761
1547503051.692193: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x17898d) [0x5608c151b98d]
1547503051.692197: wpa_group_init() ../src/ap/wpa_auth.c:367
1547503051.692200: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_init+0xa3) [0x5608c151ccc3]
1547503051.692204: wpa_init() ../src/ap/wpa_auth.c:437
1547503051.692207: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x728a2) [0x5608c14158a2]
1547503051.692211: __mesh_rsn_auth_init() mesh_rsn.c:176
1547503051.692214: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(mesh_rsn_auth_init+0x7d) [0x5608c1415b1d]
1547503051.692217: mesh_rsn_auth_init() mesh_rsn.c:245
1547503051.692220: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_join_mesh+0x67b) [0x5608c1411ecb]
1547503051.692224: wpas_mesh_init_rsn() mesh.c:189
1547503051.692226: wpas_mesh_complete() mesh.c:207
1547503051.692227: wpa_supplicant_join_mesh() mesh.c:527
1547503051.692231: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_associate+0x127) [0x5608c157d9c7]
1547503051.692234: wpa_supplicant_associate() wpa_supplicant.c:1992
1547503051.692237: [8]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x1eb179) [0x5608c158e179]
1547503051.692241: wpa_supplicant_scan() scan.c:928
1547503051.692244: [9]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(eloop_run+0x214) [0x5608c140a2a4]
1547503051.692248: eloop_run() ../src/utils/eloop.c:1196
1547503051.692251: [10]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_run+0x7b) [0x5608c15799cb]
1547503051.692255: wpa_supplicant_run() wpa_supplicant.c:6419
1547503051.692258: [11]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(main+0x402) [0x5608c13f3f82]
1547503051.692261: main() main.c:392
1547503051.692263: WPA_TRACE: memleak - END
1547503051.692264: MEMLEAK[0x5608c267fa80]: len 22
1547503051.692266: WPA_TRACE: memleak - START
1547503051.692496: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8a) [0x5608c1407dfa]
1547503051.692500: os_malloc() ../src/utils/os_unix.c:702
1547503051.692644: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_auth_gen_wpa_ie+0x11c) [0x5608c1522e4c]
1547503051.692649: wpa_auth_gen_wpa_ie() ../src/ap/wpa_auth_ie.c:487
1547503051.692652: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_init+0x8c) [0x5608c151ccac]
1547503051.692656: wpa_init() ../src/ap/wpa_auth.c:430
1547503051.692659: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x728a2) [0x5608c14158a2]
1547503051.692663: __mesh_rsn_auth_init() mesh_rsn.c:176
1547503051.692666: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(mesh_rsn_auth_init+0x7d) [0x5608c1415b1d]
1547503051.692669: mesh_rsn_auth_init() mesh_rsn.c:245
1547503051.692673: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_join_mesh+0x67b) [0x5608c1411ecb]
1547503051.692677: wpas_mesh_init_rsn() mesh.c:189
1547503051.692678: wpas_mesh_complete() mesh.c:207
1547503051.692680: wpa_supplicant_join_mesh() mesh.c:527
1547503051.692683: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_associate+0x127) [0x5608c157d9c7]
1547503051.692687: wpa_supplicant_associate() wpa_supplicant.c:1992
1547503051.692690: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x1eb179) [0x5608c158e179]
1547503051.692693: wpa_supplicant_scan() scan.c:928
1547503051.692697: [8]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(eloop_run+0x214) [0x5608c140a2a4]
1547503051.692701: eloop_run() ../src/utils/eloop.c:1196
1547503051.692704: [9]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_run+0x7b) [0x5608c15799cb]
1547503051.692708: wpa_supplicant_run() wpa_supplicant.c:6419
1547503051.692711: [10]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(main+0x402) [0x5608c13f3f82]
1547503051.692715: main() main.c:392
1547503051.692716: WPA_TRACE: memleak - END
1547503051.692718: MEMLEAK[0x5608c26779b0]: len 528
1547503051.692719: WPA_TRACE: memleak - START
1547503051.692941: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8a) [0x5608c1407dfa]
1547503051.692945: os_malloc() ../src/utils/os_unix.c:702
1547503051.692949: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_zalloc+0x9) [0x5608c1408369]
1547503051.692952: os_zalloc() ../src/utils/os_unix.c:761
1547503051.692956: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_init+0x1e) [0x5608c151cc3e]
1547503051.692959: wpa_init() ../src/ap/wpa_auth.c:423
1547503051.692962: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x728a2) [0x5608c14158a2]
1547503051.692966: __mesh_rsn_auth_init() mesh_rsn.c:176
1547503051.692969: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(mesh_rsn_auth_init+0x7d) [0x5608c1415b1d]
1547503051.692972: mesh_rsn_auth_init() mesh_rsn.c:245
1547503051.692976: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_join_mesh+0x67b) [0x5608c1411ecb]
1547503051.692979: wpas_mesh_init_rsn() mesh.c:189
1547503051.692981: wpas_mesh_complete() mesh.c:207
1547503051.692983: wpa_supplicant_join_mesh() mesh.c:527
1547503051.692986: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_associate+0x127) [0x5608c157d9c7]
1547503051.692990: wpa_supplicant_associate() wpa_supplicant.c:1992
1547503051.692993: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(+0x1eb179) [0x5608c158e179]
1547503051.692996: wpa_supplicant_scan() scan.c:928
1547503051.693000: [8]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(eloop_run+0x214) [0x5608c140a2a4]
1547503051.693003: eloop_run() ../src/utils/eloop.c:1196
1547503051.693007: [9]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_run+0x7b) [0x5608c15799cb]
1547503051.693010: wpa_supplicant_run() wpa_supplicant.c:6419
1547503051.693013: [10]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(main+0x402) [0x5608c13f3f82]
1547503051.693017: main() main.c:392
1547503051.693019: WPA_TRACE: memleak - END
1547503051.693020: MEMLEAK: total 2102 bytes
---
wpa_supplicant/mesh.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index dd6aad6f0..e9457f044 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -251,7 +251,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
struct mesh_conf *mconf;
int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 };
int rate_len;
- int frequency, saved_freq;
+ int frequency;
if (!wpa_s->conf->user_mpm) {
/* not much for us to do here */
@@ -383,13 +383,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
conf->basic_rates[rate_len] = -1;
}
- /* Handle pri/sec switch frequency within AP configuration parameter
- * generation without changing the stored network profile in the end. */
- saved_freq = ssid->frequency;
- ssid->frequency = frequency;
- wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
- ssid->frequency = saved_freq;
-
if (wpa_drv_init_mesh(wpa_s)) {
wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
return -1;
@@ -401,6 +394,8 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
return -1;
}
+ wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
+
return 0;
out_free:
wpa_supplicant_mesh_deinit(wpa_s);
--
2.17.1
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
