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

Commit 45fb01a8 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Use bd_name_copy everywhere - few missed places fix" into main am: 83dd4ca1 am: 7894267b 

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



Change-Id: Ie2a6ee900b86cf1169f2862af76f4c0c88f9ebda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 782839da 7894267b

system/bta/dm/bta_dm_sec.cc

+7 −21
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
             bt_transport_text(transport), DeviceTypeText(device_type));



  tBTA_DM_SEC sec_event;

  const char* p_name;



  tBTM_STATUS status = get_btm_client_interface().security.BTM_SecBond(

      bd_addr, addr_type, transport, device_type);
@@ -169,11 +168,9 @@ void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
  if (bta_dm_sec_cb.p_sec_cback && (status != BTM_CMD_STARTED)) {

    memset(&sec_event, 0, sizeof(tBTA_DM_SEC));

    sec_event.auth_cmpl.bd_addr = bd_addr;

    p_name = get_btm_client_interface().security.BTM_SecReadDevName(bd_addr);

    if (p_name != NULL) {

      memcpy(sec_event.auth_cmpl.bd_name, p_name, BD_NAME_LEN);

      sec_event.auth_cmpl.bd_name[BD_NAME_LEN] = 0;

    }

    bd_name_from_char_pointer(

        sec_event.auth_cmpl.bd_name,

        get_btm_client_interface().security.BTM_SecReadDevName(bd_addr));



    /*      taken care of by memset [above]

            sec_event.auth_cmpl.key_present = false;
@@ -243,7 +240,6 @@ void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg) { 
static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) {

  tBTM_REMOTE_DEV_NAME* p_result = (tBTM_REMOTE_DEV_NAME*)p_data;

  tBTA_DM_SEC sec_event;

  uint32_t bytes_to_copy;

  tBTA_DM_SEC_EVT event = bta_dm_sec_cb.pin_evt;



  if (BTA_DM_SP_CFM_REQ_EVT == event) {
@@ -252,11 +248,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
    sec_event.cfm_req.dev_class = bta_dm_sec_cb.pin_dev_class;



    if (p_result && p_result->status == BTM_SUCCESS) {

      bytes_to_copy =

          (p_result->length < BD_NAME_LEN) ? p_result->length : BD_NAME_LEN;

      memcpy(sec_event.cfm_req.bd_name, p_result->remote_bd_name,

             bytes_to_copy);

      sec_event.pin_req.bd_name[BD_NAME_LEN] = 0;

      bd_name_copy(sec_event.cfm_req.bd_name, p_result->remote_bd_name);

    } else /* No name found */

      sec_event.cfm_req.bd_name[0] = 0;
@@ -277,11 +269,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
    sec_event.pin_req.dev_class = bta_dm_sec_cb.pin_dev_class;



    if (p_result && p_result->status == BTM_SUCCESS) {

      bytes_to_copy = (p_result->length < BD_NAME_LEN) ? p_result->length

                                                       : (BD_NAME_LEN - 1);

      memcpy(sec_event.pin_req.bd_name, p_result->remote_bd_name,

             bytes_to_copy);

      sec_event.pin_req.bd_name[BD_NAME_LEN] = 0;

      bd_name_copy(sec_event.pin_req.bd_name, p_result->remote_bd_name);

    } else /* No name found */

      sec_event.pin_req.bd_name[0] = 0;
@@ -356,8 +344,7 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr, 


  p_auth_cmpl->bd_addr = bd_addr;



  memcpy(p_auth_cmpl->bd_name, bd_name, BD_NAME_LEN);

  p_auth_cmpl->bd_name[BD_NAME_LEN] = 0;

  bd_name_copy(p_auth_cmpl->bd_name, bd_name);

  p_auth_cmpl->key_present = true;

  p_auth_cmpl->key_type = key_type;

  p_auth_cmpl->success = true;
@@ -402,8 +389,7 @@ static void bta_dm_authentication_complete_cback( 
                  .bd_addr = bd_addr,

              },

      };

      memcpy(sec_event.auth_cmpl.bd_name, bd_name, BD_NAME_LEN);

      sec_event.auth_cmpl.bd_name[BD_NAME_LEN] = 0;

      bd_name_copy(sec_event.auth_cmpl.bd_name, bd_name);



      // Report the BR link key based on the BR/EDR address and type

      get_btm_client_interface().peer.BTM_ReadDevInfo(

system/btif/src/btif_dm.cc

+5 −10
Original line number Diff line number Diff line
@@ -1011,8 +1011,7 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 
                                (tBT_DEVICE_TYPE)dev_type);



  const RawAddress& bd_addr = p_pin_req->bd_addr;

  memcpy(bd_name.name, p_pin_req->bd_name, BD_NAME_LEN);

  bd_name.name[BD_NAME_LEN] = '\0';

  bd_name_copy(bd_name.name, p_pin_req->bd_name);



  if (pairing_cb.state == BT_BOND_STATE_BONDING &&

      bd_addr != pairing_cb.bd_addr) {
@@ -3585,8 +3584,7 @@ static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif) { 
                                       p_ssp_key_notif->bd_name, kDevClassEmpty,

                                       (tBT_DEVICE_TYPE)dev_type);

  bd_addr = p_ssp_key_notif->bd_addr;

  memcpy(bd_name.name, p_ssp_key_notif->bd_name, BD_NAME_LEN);

  bd_name.name[BD_NAME_LEN] = '\0';

  bd_name_copy(bd_name.name, p_ssp_key_notif->bd_name);



  bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);

  pairing_cb.is_ssp = false;
@@ -3840,8 +3838,7 @@ static void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req, 
                                       (tBT_DEVICE_TYPE)dev_type);



  RawAddress bd_addr = p_ble_req->bd_addr;

  memcpy(bd_name.name, p_ble_req->bd_name, BD_NAME_LEN);

  bd_name.name[BD_NAME_LEN] = '\0';

  bd_name_copy(bd_name.name, p_ble_req->bd_name);



  bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
@@ -3884,8 +3881,7 @@ static void btif_dm_ble_passkey_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 
                                       (tBT_DEVICE_TYPE)dev_type);



  RawAddress bd_addr = p_pin_req->bd_addr;

  memcpy(bd_name.name, p_pin_req->bd_name, BD_NAME_LEN);

  bd_name.name[BD_NAME_LEN] = '\0';

  bd_name_copy(bd_name.name, p_pin_req->bd_name);



  bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);

  pairing_cb.is_le_only = true;
@@ -3909,8 +3905,7 @@ static void btif_dm_ble_key_nc_req_evt(tBTA_DM_SP_KEY_NOTIF* p_notif_req) { 
  RawAddress bd_addr = p_notif_req->bd_addr;



  bt_bdname_t bd_name;

  memcpy(bd_name.name, p_notif_req->bd_name, BD_NAME_LEN);

  bd_name.name[BD_NAME_LEN] = '\0';

  bd_name_copy(bd_name.name, p_notif_req->bd_name);



  bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);

  pairing_cb.is_ssp = false;

system/stack/btm/btm_ble_gap.cc

+1 −6
Original line number Diff line number Diff line
@@ -1999,12 +1999,7 @@ void btm_ble_read_remote_name_cmpl(bool status, const RawAddress& bda, 
                                   uint16_t length, char* p_name) {

  tHCI_STATUS hci_status = HCI_SUCCESS;

  BD_NAME bd_name;



  memset(bd_name, 0, (BD_NAME_LEN + 1));

  if (length > BD_NAME_LEN) {

    length = BD_NAME_LEN;

  }

  memcpy((uint8_t*)bd_name, p_name, length);

  bd_name_from_char_pointer(bd_name, p_name);



  if ((!status) || (length == 0)) {

    hci_status = HCI_ERR_HOST_TIMEOUT;