| commit | 3c81edcdb5be9258b12f3d3726413927be81ff00 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 06 19:24:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 06 19:24:20 2022 +0000 |
| tree | 65b0fd695f9f65e24d38af3c4c613d4090d2a1f0 | |
| parent | 2c30fee9a6bfd165ea75e649f1675c20db0d9b9f [diff] | |
| parent | 2bd8e9243678125bd55d94e964541b6b8bcc4a26 [diff] |
Merge "p2p_supplicant: ensure go_dev_addr is init'ed" am: 5a376bf221 am: 2bd8e92436 Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1875703 Change-Id: Ie713d6a2528fe66fa9f0a1edae7df76f004936b4
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;