| commit | 89b8a1f509376732a378a6d26b0f453c6432714d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 06 19:56:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 19:56:14 2022 +0000 |
| tree | 50c3321aeb905772514c86901c0cc15f2b31f431 | |
| parent | 658bbdfa1a5c4725877520806b957824d00a8010 [diff] | |
| parent | 2787c6fa3021d14074eca4927561f386a67fb6e7 [diff] |
Merge "p2p_supplicant: ensure go_dev_addr is init'ed" am: 5a376bf221 am: 2bd8e92436 am: 3c81edcdb5 am: 2787c6fa30 Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1875703 Change-Id: Ie12b4826921f92fc34f88c61712a19a28d6ff465
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index c68e515..bc55161 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;