commit 342cb328b66f46b19e218c2e0e652a169ee0817a
author weichinweng <weichinweng@google.com> Tue Jul 28 16:56:33 2020 +0800
committer Weichin Weng <weichinweng@google.com> Wed Aug 05 08:07:04 2020 +0000
tree 5da30e93e3638ea11868730ea08eaf337033a514
parent 57ffe1ba12f25f80eeb985f11400f9eebaf99619

Fix possible OOB when receive gatt read type response data

Bug: 158833854
Bug: 158778659
Test: manual
Tag: #security

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3

stack/gatt/gatt_cl.cc

diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc
index d83582a..30b3fa8 100644
--- a/stack/gatt/gatt_cl.cc
+++ b/stack/gatt/gatt_cl.cc
@@ -772,6 +772,12 @@
     /* discover included service */
     else if (p_clcb->operation == GATTC_OPTYPE_DISCOVERY &&
              p_clcb->op_subtype == GATT_DISC_INC_SRVC) {
+      if (value_len < 4) {
+        android_errorWriteLog(0x534e4554, "158833854");
+        GATT_TRACE_ERROR("Illegal Response length, must be at least 4.");
+        gatt_end_operation(p_clcb, GATT_INVALID_PDU, NULL);
+        return;
+      }
       STREAM_TO_UINT16(record_value.incl_service.s_handle, p);
       STREAM_TO_UINT16(record_value.incl_service.e_handle, p);
 
@@ -824,6 +830,12 @@
       return;
     } else /* discover characterisitic */
     {
+      if (value_len < 3) {
+        android_errorWriteLog(0x534e4554, "158778659");
+        GATT_TRACE_ERROR("Illegal Response length, must be at least 3.");
+        gatt_end_operation(p_clcb, GATT_INVALID_PDU, NULL);
+        return;
+      }
       STREAM_TO_UINT8(record_value.dclr_value.char_prop, p);
       STREAM_TO_UINT16(record_value.dclr_value.val_handle, p);
       if (!GATT_HANDLE_IS_VALID(record_value.dclr_value.val_handle)) {