commit 0d03c17ee5f547ecbb3654330bb37d12475194f7
author Jimmy Chen <jimmycmchen@google.com> Thu Oct 03 10:50:48 2019 +0800
committer Jimmy Chen <jimmycmchen@google.com> Tue Oct 29 11:36:26 2019 +0800
tree d8ae012f37ab72a9b5cc07f9e6a9a216d4286245
parent a434a5e73983647993194e4c6a04cd55c8f11e47

p2p: handle terminated p2p interface during join scan

Fixes: 141773120
Bug: 141773120
Test: atest VtsHalWifiSupplicantP2pV1_2TargetTest
Change-Id: I5162fabeea9acb5910b3d8da463a0fcfc8f25cdb

wpa_supplicant/hidl/1.2/p2p_iface.cpp

diff --git a/wpa_supplicant/hidl/1.2/p2p_iface.cpp b/wpa_supplicant/hidl/1.2/p2p_iface.cpp
index ada7ee6..4df65aa 100644
--- a/wpa_supplicant/hidl/1.2/p2p_iface.cpp
+++ b/wpa_supplicant/hidl/1.2/p2p_iface.cpp
@@ -225,6 +225,12 @@
 	size_t ielen;
 	unsigned int bands;
 
+	if (!wpa_s->global->p2p) {
+		wpa_printf(MSG_ERROR,
+		    "P2P: P2P interface is gone, cancel join scan");
+		return -ENXIO;
+	}
+
 	os_memset(&params, 0, sizeof(params));
 	if (ssid.size() > 0) {
 		params.ssids[0].ssid = ssid.data();