Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f020c019 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix an OOB bug in smp_proc_sec_req" into tm-dev am: f5af0187 am: 52847cc5 am: 60ad7399 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/25492676



Change-Id: I94cdbc5d11a25e5fb77ef5776ed7d42bf88b10f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5d03273 60ad7399

system/stack/smp/smp_act.cc

+7 −0
Original line number Diff line number Diff line
@@ -460,6 +460,13 @@ void smp_send_ltk_reply(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
 * Description  process security request.

 ******************************************************************************/

void smp_proc_sec_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  if (smp_command_has_invalid_length(p_cb)) {

    tSMP_INT_DATA smp_int_data;

    smp_int_data.status = SMP_INVALID_PARAMETERS;

    smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);

    return;

  }



  tBTM_LE_AUTH_REQ auth_req = *(tBTM_LE_AUTH_REQ*)p_data->p_data;

  tBTM_BLE_SEC_REQ_ACT sec_req_act;