jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Remove group from timeout on PSK failure

Browse source 
Avoid potential issues with removing a P2P group on PSK failure directly
from the wpa_supplicant_event() call since the caller (in driver_*.c)
may not be prepared for the interface disappearing at that point in
time.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-09-02 16:33:42 +03:00 committed by Jouni Malinen
parent 18b12b56c1
commit 813e7b364f
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/p2p_supplicant.c
View file

@ -6255,6 +6255,13 @@ void wpas_p2p_remove_client(struct wpa_supplicant *wpa_s, const u8 *peer,
} }
static void wpas_p2p_psk_failure_removal(void *eloop_ctx, void *timeout_ctx)
{
struct wpa_supplicant *wpa_s = eloop_ctx;
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_PSK_FAILURE);
}
int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s) int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s)
{ {
struct wpa_ssid *ssid = wpa_s->current_ssid; struct wpa_ssid *ssid = wpa_s->current_ssid;
@ -6288,7 +6295,13 @@ int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s)
persistent->id); persistent->id);
disconnect: disconnect:
wpa_s->p2p_last_4way_hs_fail = NULL; wpa_s->p2p_last_4way_hs_fail = NULL;
wpas_p2p_group_delete(wpa_s, P2P_GROUP_REMOVAL_PSK_FAILURE); /*
* Remove the group from a timeout to avoid issues with caller
* continuing to use the interface if this is on a P2P group
* interface.
*/
eloop_register_timeout(0, 0, wpas_p2p_psk_failure_removal,
wpa_s, NULL);
return 1; return 1;
} }