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

Commit 02336e73 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "l2cap: Verify number of channels in the CoC request" into tm-dev am:... 

Merge "l2cap: Verify number of channels in the CoC request" into tm-dev am: 273f61b3 am: 868e6aa8

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



Change-Id: I6260552e552138874498a78579883d8e9b394f74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c466d4ce 868e6aa8

system/stack/l2cap/l2c_ble.cc

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <base/logging.h>

#include <base/strings/stringprintf.h>

#include <log/log.h>



#include "bt_target.h"

#include "bta/include/bta_hearing_aid_api.h"
@@ -522,6 +523,15 @@ void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 


      /* Check how many channels remote side wants. */

      num_of_channels = (p_pkt_end - p) / sizeof(uint16_t);

      if (num_of_channels > L2CAP_CREDIT_BASED_MAX_CIDS) {

        android_errorWriteLog(0x534e4554, "232256974");

        LOG_WARN("L2CAP - invalid number of channels requested: %d",

                 num_of_channels);

        l2cu_reject_credit_based_conn_req(p_lcb, id,

                                          L2CAP_CREDIT_BASED_MAX_CIDS,

                                          L2CAP_LE_RESULT_INVALID_PARAMETERS);

        return;

      }



      LOG_DEBUG(

          "Recv L2CAP_CMD_CREDIT_BASED_CONN_REQ with "