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

Commit 0c076546 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix L2cap LE COC security record leaks" into sc-dev

parents 8a02b5b5 18b7194b

system/stack/gap/gap_conn.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -994,7 +994,7 @@ static void gap_release_ccb(tGAP_CCB* p_ccb) { 
  }

  }





  /* Free the security record for this PSM */

  /* Free the security record for this PSM */

  BTM_SecClrService(p_ccb->service_id);

  BTM_SecClrServiceByPsm(p_ccb->psm);

  if (p_ccb->transport == BT_TRANSPORT_BR_EDR) L2CA_Deregister(p_ccb->psm);

  if (p_ccb->transport == BT_TRANSPORT_BR_EDR) L2CA_Deregister(p_ccb->psm);

  if (p_ccb->transport == BT_TRANSPORT_LE) L2CA_DeregisterLECoc(p_ccb->psm);

  if (p_ccb->transport == BT_TRANSPORT_LE) L2CA_DeregisterLECoc(p_ccb->psm);

}

}

system/stack/l2cap/l2c_api.cc

+5 −1
Original line number Original line Diff line number Diff line
@@ -382,7 +382,11 @@ uint16_t L2CA_RegisterLECoc(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, 
    return bluetooth::shim::L2CA_RegisterLECoc(psm, p_cb_info, sec_level, cfg);

    return bluetooth::shim::L2CA_RegisterLECoc(psm, p_cb_info, sec_level, cfg);

  }

  }





  if (p_cb_info.pL2CA_ConnectInd_Cb != nullptr && psm < LE_DYNAMIC_PSM_START) {

    //  If we register LE COC for outgoing connection only, don't register with

    //  BTM_Sec, because it's handled by L2CA_ConnectLECocReq.

    BTM_SetSecurityLevel(false, "", 0, sec_level, psm, 0, 0);

    BTM_SetSecurityLevel(false, "", 0, sec_level, psm, 0, 0);

  }





  /* Verify that the required callback info has been filled in

  /* Verify that the required callback info has been filled in

  **      Note:  Connection callbacks are required but not checked

  **      Note:  Connection callbacks are required but not checked