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

Commit 4badcb94 authored by Ugo Yu's avatar Ugo Yu Committed by Hansong Zhang
Browse files

Add packet length check in smp_proc_master_id 

Bug: 111937027
Test: manual

Change-Id: I1144c9879e84fa79d68ad9d5fece4f58e2a3b075
parent bf5efcde

system/stack/smp/smp_act.cc

+8 −0
Original line number Diff line number Diff line
@@ -919,6 +919,14 @@ void smp_proc_master_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  tBTM_LE_PENC_KEYS le_key;



  SMP_TRACE_DEBUG("%s", __func__);



  if (p_cb->rcvd_cmd_len < 11) {  // 1(Code) + 2(EDIV) + 8(Rand)

    android_errorWriteLog(0x534e4554, "111937027");

    SMP_TRACE_ERROR("%s: Invalid command length: %d, should be at least 11",

                    __func__, p_cb->rcvd_cmd_len);

    return;

  }



  smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ENC, true);



  STREAM_TO_UINT16(le_key.ediv, p);