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

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

Merge "Fix an integer underflow in build_read_multi_rsp" into tm-dev am: 82ce3fef am: a2ef2c73 

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



Change-Id: Ia0a5719ed98149b9c4b495e19148fe4fc13258ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26150116 a2ef2c73

system/stack/gatt/gatt_sr.cc

+17 −15
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 *  this file contains the GATT server functions

 *

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

#include <algorithm>

#include <string.h>



#include "bt_target.h"
@@ -179,37 +180,38 @@ static void build_read_multi_rsp(tGATT_SR_CMD* p_cmd, uint16_t mtu) { 
    }



    if (p_rsp != NULL) {

      total_len = (p_buf->len + p_rsp->attr_value.len);

      total_len = p_buf->len;

      if (p_cmd->multi_req.variable_len) {

        total_len += 2;

      }



      if (total_len > mtu) {

        /* just send the partial response for the overflow case */

        len = p_rsp->attr_value.len - (total_len - mtu);

        VLOG(1) << "Buffer space not enough for this data item, skipping";

        break;

      }



      len = std::min((size_t) p_rsp->attr_value.len, mtu - total_len);



      if (len == 0) {

        VLOG(1) << "Buffer space not enough for this data item, skipping";

        break;

      }



      if (len < p_rsp->attr_value.len) {

        is_overflow = true;

        VLOG(1) << StringPrintf(

            "multi read overflow available len=%zu val_len=%d", len,

            p_rsp->attr_value.len);

      } else {

        len = p_rsp->attr_value.len;

      }



      if (p_cmd->multi_req.variable_len) {

        UINT16_TO_STREAM(p, len);

        UINT16_TO_STREAM(p, (uint16_t) len);

        p_buf->len += 2;

      }



      if (p_rsp->attr_value.handle == p_cmd->multi_req.handles[ii]) {

        // check for possible integer overflow

        if (p_buf->len + len <= UINT16_MAX) {

          memcpy(p, p_rsp->attr_value.value, len);

          if (!is_overflow) p += len;

          p_buf->len += len;

        } else {

          p_cmd->status = GATT_NOT_FOUND;

          break;

        }

        ARRAY_TO_STREAM(p, p_rsp->attr_value.value, (uint16_t) len);

        p_buf->len += (uint16_t) len;

      } else {

        p_cmd->status = GATT_NOT_FOUND;

        break;