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

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

Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into tm-dev am: b7c4b272 am:... 

Merge "Fix multiple OOB bugs in btm_ble_gap.cc" into tm-dev am: b7c4b272 am: 84b3691f am: bf3f95e3

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



Change-Id: Ic41a736771e05a7a0821c6a9f5db11a4f1fa78ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae5e3504 bf3f95e3

system/stack/btm/btm_ble_gap.cc

+27 −1
Original line number Diff line number Diff line
@@ -977,6 +977,12 @@ void btm_ble_start_sync_request(uint8_t sid, RawAddress addr, uint16_t skip, 
  uint8_t options = 0;

  uint8_t cte_type = 7;

  int index = btm_ble_get_psync_index(sid, addr);



  if (index == MAX_SYNC_TRANSACTION) {

    LOG_ERROR("Failed to get sync transfer index");

    return;

  }



  tBTM_BLE_PERIODIC_SYNC* p = &btm_ble_pa_sync_cb.p_sync[index];

  p->sync_state = PERIODIC_SYNC_PENDING;
@@ -1050,6 +1056,11 @@ static void btm_ble_start_sync_timeout(void* data) { 


  int index = btm_ble_get_psync_index(adv_sid, address);



  if (index == MAX_SYNC_TRANSACTION) {

    LOG_ERROR("Failed to get sync transfer index");

    return;

  }



  tBTM_BLE_PERIODIC_SYNC* p = &btm_ble_pa_sync_cb.p_sync[index];



  if (BleScanningManager::IsInitialized()) {
@@ -1253,11 +1264,14 @@ void BTM_BleStartPeriodicSync(uint8_t adv_sid, RawAddress address, 
                              SyncLostCb lostCb, BigInfoReportCb biginfo_reportCb) {

  LOG_DEBUG("%s", "[PSync]");

  int index = btm_ble_get_free_psync_index();

  tBTM_BLE_PERIODIC_SYNC* p = &btm_ble_pa_sync_cb.p_sync[index];



  if (index == MAX_SYNC_TRANSACTION) {

    syncCb.Run(BTM_NO_RESOURCES, 0, adv_sid, BLE_ADDR_RANDOM, address, 0, 0);

    return;

  }



  tBTM_BLE_PERIODIC_SYNC* p = &btm_ble_pa_sync_cb.p_sync[index];



  p->in_use = true;

  p->remote_bda = address;

  p->sid = adv_sid;
@@ -1390,6 +1404,12 @@ void BTM_BlePeriodicSyncTransfer(RawAddress addr, uint16_t service_data, 
  }



  int index = btm_ble_get_free_sync_transfer_index();

  if (index == MAX_SYNC_TRANSACTION) {

    BTM_TRACE_ERROR("Failed to get sync transfer index");

    cb.Run(BTM_ILLEGAL_VALUE, addr);

    return;

  }



  tBTM_BLE_PERIODIC_SYNC_TRANSFER* p_sync_transfer =

      &btm_ble_pa_sync_cb.sync_transfer[index];

  p_sync_transfer->in_use = true;
@@ -1429,6 +1449,12 @@ void BTM_BlePeriodicSyncSetInfo(RawAddress addr, uint16_t service_data, 
  }



  int index = btm_ble_get_free_sync_transfer_index();

  if (index == MAX_SYNC_TRANSACTION) {

    BTM_TRACE_ERROR("Failed to get sync transfer index");

    cb.Run(BTM_ILLEGAL_VALUE, addr);

    return;

  }



  tBTM_BLE_PERIODIC_SYNC_TRANSFER* p_sync_transfer =

      &btm_ble_pa_sync_cb.sync_transfer[index];

  p_sync_transfer->in_use = true;