| commit | f73d71a402ec907f33013dcb2befceb87244976e | [log] [tgz] |
|---|---|---|
| author | Sunil Ravi <sunilravi@google.com> | Tue Apr 04 01:58:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 04 01:58:00 2023 +0000 |
| tree | 174903a669a87eaf83c3fb980f6273cfcedd4a41 | |
| parent | 3d8519275dfc363171e5530af8c19a0585e23b10 [diff] | |
| parent | f090dd3bae4bf8bde22311686b765866de457fa4 [diff] |
Merge "Security fix for out of bound read in p2p_invite" into udc-dev am: f090dd3bae Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/22438192 Change-Id: I5cae08fbc40d6dfe47087ed913d537a92ddf39a0 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 2afd75b..a48fcb3 100644 --- a/wpa_supplicant/aidl/p2p_iface.cpp +++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -1117,7 +1117,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(