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

Commit ad8c6bce authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Fix possible OOB read am: 1a7dec51 

am: a10f3a2f

Change-Id: I83f0e68dbd0f6f1a521215d6b2543c23734f486f
parents 23019e93 a10f3a2f

system/stack/sdp/sdp_discovery.cc

+11 −0
Original line number Diff line number Diff line
@@ -277,6 +277,11 @@ static void process_service_search_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
  uint16_t total, cur_handles, orig;

  uint8_t cont_len;



  if (p_reply + 8 > p_reply_end) {

    android_errorWriteLog(0x534e4554, "74249842");

    sdp_disconnect(p_ccb, SDP_GENERIC_ERROR);

    return;

  }

  /* Skip transaction, and param len */

  p_reply += 4;

  BE_STREAM_TO_UINT16(total, p_reply);
@@ -295,6 +300,12 @@ static void process_service_search_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
  if (p_ccb->num_handles > sdp_cb.max_recs_per_search)

    p_ccb->num_handles = sdp_cb.max_recs_per_search;



  if (p_reply + ((p_ccb->num_handles - orig) * 4) + 1 > p_reply_end) {

    android_errorWriteLog(0x534e4554, "74249842");

    sdp_disconnect(p_ccb, SDP_GENERIC_ERROR);

    return;

  }



  for (xx = orig; xx < p_ccb->num_handles; xx++)

    BE_STREAM_TO_UINT32(p_ccb->handles[xx], p_reply);