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

Commit 29874930 authored by Hui Peng's avatar Hui Peng Committed by Cherrypicker Worker
Browse files

Fix an OOB Write bug in avrc_vendor_msg 

Plus some cleanup

Bug: 271962784
Test: manual
Ignore-AOSP-First: security
Tag: #security
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b636f1bcd097b612de7696594d05cb9ea84939fa)
Merged-In: Ice5ad780ac0b177c73d84ed37960b4540df1ec86
Change-Id: Ice5ad780ac0b177c73d84ed37960b4540df1ec86
parent ae15d6d9

system/stack/avrc/avrc_opt.cc

+13 −2
Original line number Diff line number Diff line
@@ -49,9 +49,20 @@ static BT_HDR* avrc_vendor_msg(tAVRC_MSG_VENDOR* p_msg) { 
  BT_HDR* p_cmd;

  uint8_t* p_data;



  CHECK(p_msg != NULL);

  /*

    An AVRC cmd consists of at least of:

    - A BT_HDR, plus

    - AVCT_MSG_OFFSET, plus

    - 3 bytes for ctype, subunit_type and op_vendor, plus

    - 3 bytes for company_id

  */

  #define AVRC_MIN_VENDOR_CMD_LEN (sizeof(BT_HDR) + AVCT_MSG_OFFSET + 3 + 3)



  if (p_msg == nullptr ||

      AVRC_META_CMD_BUF_SIZE < AVRC_MIN_VENDOR_CMD_LEN + p_msg->vendor_len) {

    return nullptr;

  }



  CHECK(AVRC_META_CMD_BUF_SIZE > (AVRC_MIN_CMD_LEN + p_msg->vendor_len));

  p_cmd = (BT_HDR*)osi_calloc(AVRC_META_CMD_BUF_SIZE);



  p_cmd->offset = AVCT_MSG_OFFSET;