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

Commit caa39c19 authored by weichinweng's avatar weichinweng Committed by android-build-team Robot
Browse files

Fix possible OOB when receive gatt read type response data 

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

Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
(cherry picked from commit 3f029b64)
parent bd2b4eb2

system/stack/gatt/gatt_cl.cc

+12 −0
Original line number Diff line number Diff line
@@ -771,6 +771,12 @@ void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, 
    /* 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");

        LOG(ERROR) << __func__ << " 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 @@ void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, 
      return;

    } else /* discover characterisitic */

    {

      if (value_len < 3) {

        android_errorWriteLog(0x534e4554, "158778659");

        LOG(ERROR) << __func__ << " 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)) {