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

Commit d65661fc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "L2CAP: Bounds check num_handles in NumCompletedPackets" into qt-qpr1-dev am: 1b3e12fd 

Change-Id: I428324170a1a0eb5b95a40d38909e756404050e1
parents 8f4b09d2 1b3e12fd

system/stack/btu/btu_hcif.cc

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void btu_hcif_command_status_evt(uint8_t status, BT_HDR* command, 
static void btu_hcif_hardware_error_evt(uint8_t* p);

static void btu_hcif_flush_occured_evt(void);

static void btu_hcif_role_change_evt(uint8_t* p);

static void btu_hcif_num_compl_data_pkts_evt(uint8_t* p);

static void btu_hcif_num_compl_data_pkts_evt(uint8_t* p, uint8_t evt_len);

static void btu_hcif_mode_change_evt(uint8_t* p);

static void btu_hcif_pin_code_request_evt(uint8_t* p);

static void btu_hcif_link_key_request_evt(uint8_t* p);
@@ -328,7 +328,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) { 
      btu_hcif_role_change_evt(p);

      break;

    case HCI_NUM_COMPL_DATA_PKTS_EVT:

      btu_hcif_num_compl_data_pkts_evt(p);

      btu_hcif_num_compl_data_pkts_evt(p, hci_evt_len);

      break;

    case HCI_MODE_CHANGE_EVT:

      btu_hcif_mode_change_evt(p);
@@ -1702,9 +1702,9 @@ static void btu_hcif_role_change_evt(uint8_t* p) { 
 * Returns          void

 *

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

static void btu_hcif_num_compl_data_pkts_evt(uint8_t* p) {

static void btu_hcif_num_compl_data_pkts_evt(uint8_t* p, uint8_t evt_len) {

  /* Process for L2CAP and SCO */

  l2c_link_process_num_completed_pkts(p);

  l2c_link_process_num_completed_pkts(p, evt_len);



  /* Send on to SCO */

  /*?? No SCO for now */

system/stack/l2cap/l2c_int.h

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ extern void l2c_info_resp_timer_timeout(void* data); 
extern void l2c_link_check_send_pkts(tL2C_LCB* p_lcb, tL2C_CCB* p_ccb,

                                     BT_HDR* p_buf);

extern void l2c_link_adjust_allocation(void);

extern void l2c_link_process_num_completed_pkts(uint8_t* p);

extern void l2c_link_process_num_completed_pkts(uint8_t* p, uint8_t evt_len);

extern void l2c_link_process_num_completed_blocks(uint8_t controller_id,

                                                  uint8_t* p, uint16_t evt_len);

extern void l2c_link_processs_num_bufs(uint16_t num_lm_acl_bufs);

system/stack/l2cap/l2c_link.cc

+12 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "l2c_api.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "log/log.h"

#include "osi/include/osi.h"



static bool l2c_link_send_to_lower(tL2C_LCB* p_lcb, BT_HDR* p_buf,
@@ -1219,13 +1220,22 @@ static bool l2c_link_send_to_lower(tL2C_LCB* p_lcb, BT_HDR* p_buf, 
 * Returns          void

 *

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

void l2c_link_process_num_completed_pkts(uint8_t* p) {

void l2c_link_process_num_completed_pkts(uint8_t* p, uint8_t evt_len) {

  uint8_t num_handles, xx;

  uint16_t handle;

  uint16_t num_sent;

  tL2C_LCB* p_lcb;



  if (evt_len > 0) {

    STREAM_TO_UINT8(num_handles, p);

  } else {

    num_handles = 0;

  }



  if (num_handles > evt_len / (2 * sizeof(uint16_t))) {

    android_errorWriteLog(0x534e4554, "141617601");

    num_handles = evt_len / (2 * sizeof(uint16_t));

  }



  for (xx = 0; xx < num_handles; xx++) {

    STREAM_TO_UINT16(handle, p);