commit 148905f7ac3ef429ccc4c632ed602972be17e2b2
author Jimmy Chen <jimmycmchen@google.com> Wed Oct 30 08:04:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 30 08:04:05 2019 -0700
tree 779152590bcd98059a6d3c1f1b55449d46611c03
parent 64c759c6ec83818e37a6547b19bb12107f0ef72f
parent 0d03c17ee5f547ecbb3654330bb37d12475194f7

p2p: handle terminated p2p interface during join scan
am: 0d03c17ee5

Change-Id: I0802fd2357eeee1866e9a69d4156557ead78448d

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();