commit bb6c888ea9c778ae6ee88685b148eee290bf7385
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 11 18:42:10 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu May 11 18:42:10 2023 +0000
tree fd6f20974682033c34ece18b5c4290e883538295
parent 2d1500894bb878fae13e7518935b6176b974f479
parent ec573bc83f1ed6722f7cb29431dcb2db7f10bf28

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22316109'] into security-aosp-tm-release.

Change-Id: Iaaa8523b396c0dc026d09a2ce6096f9de04f0c19

system/stack/gatt/gatt_utils.cc

diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc
index 991944a..ff15e28 100644
--- a/system/stack/gatt/gatt_utils.cc
+++ b/system/stack/gatt/gatt_utils.cc
@@ -1501,6 +1501,13 @@
       cb_data.att_value.handle = p_clcb->s_handle;
       cb_data.att_value.len = p_clcb->counter;
 
+      if (cb_data.att_value.len > GATT_MAX_ATTR_LEN) {
+        LOG(WARNING) << __func__
+                     << StringPrintf(" Large cb_data.att_value, size=%d",
+                                     cb_data.att_value.len);
+        cb_data.att_value.len = GATT_MAX_ATTR_LEN;
+      }
+
       if (p_data && p_clcb->counter)
         memcpy(cb_data.att_value.value, p_data, cb_data.att_value.len);
     }