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

Commit 5cb17f00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent use-after-free of HID reports" am: af656517 

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



Change-Id: Iab3603ddbc0d7c455f69f4ef57e4af29da084547
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c8330f6 af656517

system/btif/src/btif_hh.cc

+45 −5
Original line number Original line Diff line number Diff line
@@ -1119,6 +1119,38 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
  }

  }

}

}





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

 *

 * Function         btif_hh_hsdata_rpt_copy_cb

 *

 * Description      Deep copies the tBTA_HH_HSDATA structure

 *

 * Returns          void

 *

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



static void btif_hh_hsdata_rpt_copy_cb(uint16_t event, char* p_dest,

                                       char* p_src) {

  tBTA_HH_HSDATA* p_dst_data = (tBTA_HH_HSDATA*)p_dest;

  tBTA_HH_HSDATA* p_src_data = (tBTA_HH_HSDATA*)p_src;

  BT_HDR* hdr;



  if (!p_src) {

    BTIF_TRACE_ERROR("%s: Nothing to copy", __func__);

    return;

  }



  memcpy(p_dst_data, p_src_data, sizeof(tBTA_HH_HSDATA));



  hdr = p_src_data->rsp_data.p_rpt_data;

  if (hdr != NULL) {

    uint8_t* p_data = ((uint8_t*)p_dst_data) + sizeof(tBTA_HH_HSDATA);

    memcpy(p_data, hdr, BT_HDR_SIZE + hdr->offset + hdr->len);



    p_dst_data->rsp_data.p_rpt_data = (BT_HDR*)p_data;

  }

}



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

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

 *

 *

 * Function         bte_hh_evt

 * Function         bte_hh_evt
@@ -1132,6 +1164,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data) {

void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data) {

  bt_status_t status;

  bt_status_t status;

  int param_len = 0;

  int param_len = 0;

  tBTIF_COPY_CBACK* p_copy_cback = NULL;





  if (BTA_HH_ENABLE_EVT == event)

  if (BTA_HH_ENABLE_EVT == event)

    param_len = sizeof(tBTA_HH_STATUS);

    param_len = sizeof(tBTA_HH_STATUS);
@@ -1143,10 +1176,17 @@ void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data) { 
    param_len = sizeof(tBTA_HH_CBDATA);

    param_len = sizeof(tBTA_HH_CBDATA);

  else if (BTA_HH_GET_DSCP_EVT == event)

  else if (BTA_HH_GET_DSCP_EVT == event)

    param_len = sizeof(tBTA_HH_DEV_DSCP_INFO);

    param_len = sizeof(tBTA_HH_DEV_DSCP_INFO);

  else if ((BTA_HH_GET_PROTO_EVT == event) || (BTA_HH_GET_RPT_EVT == event) ||

  else if ((BTA_HH_GET_PROTO_EVT == event) || (BTA_HH_GET_IDLE_EVT == event))

           (BTA_HH_GET_IDLE_EVT == event))

    param_len = sizeof(tBTA_HH_HSDATA);

  else if (BTA_HH_GET_RPT_EVT == event) {

    BT_HDR* hdr = p_data->hs_data.rsp_data.p_rpt_data;

    param_len = sizeof(tBTA_HH_HSDATA);

    param_len = sizeof(tBTA_HH_HSDATA);

  else if ((BTA_HH_SET_PROTO_EVT == event) || (BTA_HH_SET_RPT_EVT == event) ||



    if (hdr != NULL) {

      p_copy_cback = btif_hh_hsdata_rpt_copy_cb;

      param_len += BT_HDR_SIZE + hdr->offset + hdr->len;

    }

  } else if ((BTA_HH_SET_PROTO_EVT == event) || (BTA_HH_SET_RPT_EVT == event) ||

             (BTA_HH_VC_UNPLUG_EVT == event) || (BTA_HH_SET_IDLE_EVT == event))

             (BTA_HH_VC_UNPLUG_EVT == event) || (BTA_HH_SET_IDLE_EVT == event))

    param_len = sizeof(tBTA_HH_CBDATA);

    param_len = sizeof(tBTA_HH_CBDATA);

  else if ((BTA_HH_ADD_DEV_EVT == event) || (BTA_HH_RMV_DEV_EVT == event))

  else if ((BTA_HH_ADD_DEV_EVT == event) || (BTA_HH_RMV_DEV_EVT == event))
@@ -1156,7 +1196,7 @@ void bte_hh_evt(tBTA_HH_EVT event, tBTA_HH* p_data) { 
  /* switch context to btif task context (copy full union size for convenience)

  /* switch context to btif task context (copy full union size for convenience)

   */

   */

  status = btif_transfer_context(btif_hh_upstreams_evt, (uint16_t)event,

  status = btif_transfer_context(btif_hh_upstreams_evt, (uint16_t)event,

                                 (char*)p_data, param_len, NULL);

                                 (char*)p_data, param_len, p_copy_cback);





  /* catch any failed context transfers */

  /* catch any failed context transfers */

  ASSERTC(status == BT_STATUS_SUCCESS, "context transfer failed", status);

  ASSERTC(status == BT_STATUS_SUCCESS, "context transfer failed", status);