| commit | 2787c6fa3021d14074eca4927561f386a67fb6e7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 06 19:36:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 19:36:30 2022 +0000 |
| tree | e66e7c7dd856ecedb200c86c26cf34ab343b9349 | |
| parent | f245c4621da4317d00ee7d8e1bb2a5d2225e3df7 [diff] | |
| parent | 3c81edcdb5be9258b12f3d3726413927be81ff00 [diff] |
Merge "p2p_supplicant: ensure go_dev_addr is init'ed" am: 5a376bf221 am: 2bd8e92436 am: 3c81edcdb5 Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1875703 Change-Id: I5ef47190f29faf6c2421af19a36899db5deb8a96
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 9215794..643dd0d 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c
@@ -1405,11 +1405,13 @@ persistent = ssid->p2p_persistent_group; os_memcpy(go_dev_addr, wpa_s->global->p2p_dev_addr, ETH_ALEN); - } else + } else { + os_memset(go_dev_addr, 0, ETH_ALEN); persistent = wpas_p2p_persistent_group(wpa_s, go_dev_addr, ssid->ssid, ssid->ssid_len); + } } else { client = wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT;