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

Commit 699cb600 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-df95a56f-528f-434c-972e-bb492348a21a" into nyc-dr1-dev 

* changes:
  [automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am: 9265f654
  DO NOT MERGE Add packet length check in smp_proc_master_id
parents a0da2aa5 1333b5c5

system/stack/smp/smp_act.c

+8 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,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);