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

Commit ede0480a authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Fix multiple OOB bugs resulted from tx mtu in EATT" into tm-qpr-dev am:... 

Merge "Fix multiple OOB bugs resulted from tx mtu in EATT" into tm-qpr-dev am: 9b06bf53 am: 9f1fcffe

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



Change-Id: I79ad7b0099cdb1acb2a5f4339d96b32684624840
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e495a1a 9f1fcffe

system/stack/eatt/eatt.h

+7 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#pragma once



#include <algorithm>

#include <deque>



#include "stack/gatt/gatt_int.h"
@@ -24,6 +25,7 @@ 


#define EATT_MIN_MTU_MPS (64)

#define EATT_DEFAULT_MTU (256)

#define EATT_MAX_TX_MTU  (1024)

#define EATT_ALL_CIDS (0xFFFF)



namespace bluetooth {
@@ -59,13 +61,13 @@ class EattChannel { 
  EattChannel(RawAddress& bda, uint16_t cid, uint16_t tx_mtu, uint16_t rx_mtu)

      : bda_(bda),

        cid_(cid),

        tx_mtu_(tx_mtu),

        rx_mtu_(rx_mtu),

        state_(EattChannelState::EATT_CHANNEL_PENDING),

        indicate_handle_(0),

        ind_ack_timer_(NULL),

        ind_confirmation_timer_(NULL) {

    cl_cmd_q_ = std::deque<tGATT_CMD_Q>();

    EattChannelSetTxMTU(tx_mtu);

  }



  ~EattChannel() {
@@ -94,7 +96,10 @@ class EattChannel { 
    }

    state_ = state;

  }

  void EattChannelSetTxMTU(uint16_t tx_mtu) { this->tx_mtu_ = tx_mtu; }



  void EattChannelSetTxMTU(uint16_t tx_mtu) {

    this->tx_mtu_ = std::min<uint16_t>(tx_mtu, EATT_MAX_TX_MTU);

  }

};



/* Interface class */

system/stack/eatt/eatt_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ struct eatt_impl { 
    if (is_local_cfg)

      channel->rx_mtu_ = p_cfg->mtu;

    else

      channel->tx_mtu_ = p_cfg->mtu;

      channel->EattChannelSetTxMTU(p_cfg->mtu);



    if (stack_config_get_interface()->get_pts_l2cap_ecoc_reconfigure()) {

      /* Upper tester for L2CAP - schedule sending data */