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

Commit 6ae4e8c6 authored by Chris Manton's avatar Chris Manton
Browse files

stack::l2cap Security check uses btm_status 

tHCI_STATUS is the incorrect type

Bug: 352342802
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I9d219c144aea7706222a26f4875973bad9a495a3
parent 046af374

system/stack/l2cap/l2c_csm.cc

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static void l2c_csm_term_w4_sec_comp(tL2C_CCB* p_ccb, tL2CEVT event, void* p_dat 
      break;



    case L2CEVT_SEC_COMP_NEG:

      if (((tL2C_CONN_INFO*)p_data)->status == BTM_DELAY_CHECK) {

      if (((tL2C_CONN_INFO*)p_data)->status == static_cast<tHCI_STATUS>(BTM_DELAY_CHECK)) {

        /* start a timer - encryption change not received before L2CAP connect

         * req */

        alarm_set_on_mloop(p_ccb->l2c_ccb_timer, L2CAP_DELAY_CHECK_SM4_TIMEOUT_MS,

system/stack/l2cap/l2c_link.cc

+7 −7
Original line number Diff line number Diff line
@@ -187,22 +187,22 @@ void l2c_link_hci_conn_comp(tHCI_STATUS status, uint16_t handle, const RawAddres 
 *

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

void l2c_link_sec_comp(RawAddress p_bda, tBT_TRANSPORT transport, void* p_ref_data,

                       tBTM_STATUS status) {

                       tBTM_STATUS btm_status) {

  tL2C_LCB* p_lcb;

  tL2C_CCB* p_ccb;

  tL2C_CCB* p_next_ccb;



  log::debug("btm_status={}, BD_ADDR={}, transport={}", btm_status_text(status), p_bda,

  log::debug("btm_status={}, BD_ADDR={}, transport={}", btm_status_text(btm_status), p_bda,

             bt_transport_text(transport));



  if (status == BTM_SUCCESS_NO_SECURITY) {

    status = BTM_SUCCESS;

  if (btm_status == BTM_SUCCESS_NO_SECURITY) {

    btm_status = BTM_SUCCESS;

  }



  /* Save the parameters */

  tL2C_CONN_INFO ci = {

          .bd_addr = p_bda,

          .status = status,

          .status = static_cast<tHCI_STATUS>(btm_status),

          .psm{},

          .l2cap_result{},

          .l2cap_status{},
@@ -233,7 +233,7 @@ void l2c_link_sec_comp(RawAddress p_bda, tBT_TRANSPORT transport, void* p_ref_da 
      return;

    }



    switch (status) {

    switch (btm_status) {

      case BTM_SUCCESS:

        l2c_csm_execute(p_ccb, L2CEVT_SEC_COMP, &ci);

        break;
@@ -255,7 +255,7 @@ void l2c_link_sec_comp(RawAddress p_bda, tBT_TRANSPORT transport, void* p_ref_da 
      p_next_ccb = p_ccb->p_next_ccb;



      if (p_ccb == p_ref_data) {

        switch (status) {

        switch (btm_status) {

          case BTM_SUCCESS:

            l2c_csm_execute(p_ccb, L2CEVT_SEC_COMP, &ci);

            break;