| commit | 79ea7da02582e9b145c761c75eb519a7539a8189 | [log] [tgz] |
|---|---|---|
| author | Sunil Ravi <sunilravi@google.com> | Tue Apr 04 02:26:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 04 02:26:17 2023 +0000 |
| tree | 80a670e80272ad478861b761a939c5c558409cee | |
| parent | 4cd82658f8afa8732b815e1cc6bab804742fc8b0 [diff] | |
| parent | 76f752475648fa88b58943472d6f83f702ed14b2 [diff] |
Merge "Security fix for out of bound read in p2p_invite" into udc-dev am: f090dd3bae am: 76f7524756 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/22438192 Change-Id: I73db3b67f7314552fd0212b733f5f47e2db54d80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wpa_supplicant/aidl/p2p_iface.cpp b/wpa_supplicant/aidl/p2p_iface.cpp index 7f92de1..5a7c612 100644 --- a/wpa_supplicant/aidl/p2p_iface.cpp +++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -1112,7 +1112,7 @@ const std::vector<uint8_t>& peer_address) { struct wpa_supplicant* wpa_s = retrieveIfacePtr(); - if (peer_address.size() != ETH_ALEN) { + if (go_device_address.size() != ETH_ALEN || peer_address.size() != ETH_ALEN) { return {createStatus(SupplicantStatusCode::FAILURE_UNKNOWN)}; } if (wpas_p2p_invite_group(