DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WPS: Deinit before wpas_p2p_disconnect()

Browse source 
When there is a pending WPS negotiation for P2P and signal interrupt is
triggered, invalid read occurs in wpas_wps_terminate_pending() if
wpas_p2p_disconnect() removed the interface. Inverting deinit order
solves the issue.

Signed-off-by: Eduardo Abinader <eduardo.abinader@openbossa.org>
This commit is contained in:
Eduardo Abinader 2014-05-14 09:08:47 -04:00 committed by Jouni Malinen
parent c70c37500b
commit 5516ed32c5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/wpa_supplicant.c
View file

@ -751,13 +751,13 @@ void wpa_supplicant_terminate_proc(struct wpa_global *global)
struct wpa_supplicant *wpa_s = global->ifaces; struct wpa_supplicant *wpa_s = global->ifaces;
while (wpa_s) { while (wpa_s) {
struct wpa_supplicant *next = wpa_s->next; struct wpa_supplicant *next = wpa_s->next;
if (wpas_wps_terminate_pending(wpa_s) == 1)
pending = 1;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE || if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE ||
(wpa_s->current_ssid && wpa_s->current_ssid->p2p_group)) (wpa_s->current_ssid && wpa_s->current_ssid->p2p_group))
wpas_p2p_disconnect(wpa_s); wpas_p2p_disconnect(wpa_s);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
if (wpas_wps_terminate_pending(wpa_s) == 1)
pending = 1;
wpa_s = next; wpa_s = next;
} }
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */