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

Commit f697a143 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Allocate buffers of the right size when BT_HDR is included 

Bug: 63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
parent 436b7170

system/stack/avdt/avdt_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ uint16_t AVDT_SendReport(uint8_t handle, AVDT_REPORT_TYPE type, 
    /* build SR - assume fit in one packet */

    p_tbl = avdt_ad_tc_tbl_by_type(AVDT_CHAN_REPORT, p_scb->p_ccb, p_scb);

    if (p_tbl->state == AVDT_AD_ST_OPEN) {

      BT_HDR* p_pkt = (BT_HDR*)osi_malloc(p_tbl->peer_mtu);

      BT_HDR* p_pkt = (BT_HDR*)osi_malloc(p_tbl->peer_mtu + sizeof(BT_HDR));



      p_pkt->offset = L2CAP_MIN_OFFSET;

      p = (uint8_t*)(p_pkt + 1) + p_pkt->offset;

system/stack/bnep/bnep_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void bnep_data_ind(uint16_t l2cap_cid, BT_HDR* p_buf) { 
      if (ctrl_type == BNEP_SETUP_CONNECTION_REQUEST_MSG &&

          p_bcb->con_state != BNEP_STATE_CONNECTED && extension_present && p &&

          rem_len) {

        p_bcb->p_pending_data = (BT_HDR*)osi_malloc(rem_len);

        p_bcb->p_pending_data = (BT_HDR*)osi_malloc(rem_len + sizeof(BT_HDR));

        memcpy((uint8_t*)(p_bcb->p_pending_data + 1), p, rem_len);

        p_bcb->p_pending_data->len = rem_len;

        p_bcb->p_pending_data->offset = 0;

system/stack/l2cap/l2cap_client.cc

+3 −3
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static void fragment_packet(l2cap_client_t* client, buffer_t* packet) { 


  // TODO(sharvil): eliminate copy into BT_HDR.

  BT_HDR* bt_packet = static_cast<BT_HDR*>(

      osi_malloc(buffer_length(packet) + L2CAP_MIN_OFFSET));

      osi_malloc(buffer_length(packet) + L2CAP_MIN_OFFSET + sizeof(BT_HDR)));

  bt_packet->offset = L2CAP_MIN_OFFSET;

  bt_packet->len = buffer_length(packet);

  memcpy(bt_packet->data + bt_packet->offset, buffer_ptr(packet),
@@ -408,8 +408,8 @@ static void fragment_packet(l2cap_client_t* client, buffer_t* packet) { 
      break;

    }



    BT_HDR* fragment =

        static_cast<BT_HDR*>(osi_malloc(client->remote_mtu + L2CAP_MIN_OFFSET));

    BT_HDR* fragment = static_cast<BT_HDR*>(

        osi_malloc(client->remote_mtu + L2CAP_MIN_OFFSET + sizeof(BT_HDR)));

    fragment->offset = L2CAP_MIN_OFFSET;

    fragment->len = client->remote_mtu;

    memcpy(fragment->data + fragment->offset,

system/stack/mcap/mca_cact.cc

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void mca_ccb_snd_req(tMCA_CCB* p_ccb, tMCA_CCB_EVT* p_data) { 
  if ((!p_ccb->p_tx_req) || is_abort) {

    p_ccb->p_tx_req = p_msg;

    if (!p_ccb->cong) {

      BT_HDR* p_pkt = (BT_HDR*)osi_malloc(MCA_CTRL_MTU);

      BT_HDR* p_pkt = (BT_HDR*)osi_malloc(MCA_CTRL_MTU + sizeof(BT_HDR));



      p_pkt->offset = L2CAP_MIN_OFFSET;

      p = p_start = (uint8_t*)(p_pkt + 1) + L2CAP_MIN_OFFSET;
@@ -154,7 +154,7 @@ void mca_ccb_snd_req(tMCA_CCB* p_ccb, tMCA_CCB_EVT* p_data) { 
void mca_ccb_snd_rsp(tMCA_CCB* p_ccb, tMCA_CCB_EVT* p_data) {

  tMCA_CCB_MSG* p_msg = (tMCA_CCB_MSG*)p_data;

  uint8_t *p, *p_start;

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(MCA_CTRL_MTU);

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(MCA_CTRL_MTU + sizeof(BT_HDR));



  MCA_TRACE_DEBUG("%s cong=%d req=%d", __func__, p_ccb->cong, p_msg->op_code);

  /* assume that API functions verified the parameters */
@@ -367,7 +367,7 @@ void mca_ccb_hdl_req(tMCA_CCB* p_ccb, tMCA_CCB_EVT* p_data) { 
  if (((reject_code != MCA_RSP_SUCCESS) &&

       (evt_data.hdr.op_code != MCA_OP_SYNC_INFO_IND)) ||

      send_rsp) {

    BT_HDR* p_buf = (BT_HDR*)osi_malloc(MCA_CTRL_MTU);

    BT_HDR* p_buf = (BT_HDR*)osi_malloc(MCA_CTRL_MTU + sizeof(BT_HDR));

    p_buf->offset = L2CAP_MIN_OFFSET;

    p = p_start = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET;

    *p++ = reject_opcode;