P2P: Reject p2p_find while P2P connection is in progress

Though p2p_find is not expected during ongoing P2P connection, it is
possible that any third party application issues a p2p_find resulting in
connection failure. Address this by rejecting any p2p_find command while
connection is in progress.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 2c363ec41c81910b72f5e1167193890286545978..4d03ea0de701f921ad4a83e678d1a14c55202acc 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4746,8 +4746,10 @@ int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
                return wpa_drv_p2p_find(wpa_s, timeout, type);
 
        if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL ||
-           wpa_s->p2p_in_provisioning)
+           wpa_s->p2p_in_provisioning || wpas_p2p_in_progress(wpa_s)) {
+               wpa_printf(MSG_DEBUG, "P2P: Reject p2p_find while P2P connection is in progress");
                return -1;
+       }
 
        wpa_supplicant_cancel_sched_scan(wpa_s);