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

Commit 4e56a4b8 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Reject LE COC if cid is duplicated"

parents fa2780db a0b5ff41

system/stack/include/l2cdefs.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define L2CAP_LE_INSUFFICIENT_ENCRYP 8

/* We don't like peer device response */

#define L2CAP_LE_INVALID_SOURCE_CID 9

#define L2CAP_LE_SOURCE_CID_ALREADY_ALLOCATED 0x0A



/* Define L2CAP Move Channel Response result codes

*/

system/stack/l2cap/l2c_ble.cc

+8 −0
Original line number Diff line number Diff line
@@ -668,6 +668,14 @@ void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
          "initial credit = %d",

          mtu, mps, initial_credit);



      p_ccb = l2cu_find_ccb_by_remote_cid(p_lcb, rcid);

      if (p_ccb) {

        L2CAP_TRACE_WARNING("L2CAP - rcvd conn req for duplicated cid: 0x%04x",

                            rcid);

        l2cu_reject_ble_connection(p_lcb, id, L2CAP_LE_SOURCE_CID_ALREADY_ALLOCATED);

        break;

      }



      p_rcb = l2cu_find_ble_rcb_by_psm(con_info.psm);

      if (p_rcb == NULL) {

        L2CAP_TRACE_WARNING("L2CAP - rcvd conn req for unknown PSM: 0x%04x",