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

Commit 78b7235d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 379c3adb am: f9bed1c8 

Change-Id: Iafc38d72f8e320249fc81c423b83aa119bcc3a01
parents ba012f98 f9bed1c8

system/stack/l2cap/l2c_main.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -562,6 +562,10 @@ static void process_l2cap_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len) 
                    /* sanity check option length */

                    /* sanity check option length */

                    if ((cfg_len + L2CAP_CFG_OPTION_OVERHEAD) <= cmd_len)

                    if ((cfg_len + L2CAP_CFG_OPTION_OVERHEAD) <= cmd_len)

                    {

                    {

                        if (p + cfg_len > p_next_cmd) {

                            android_errorWriteLog(0x534e4554, "79488381");

                            return;

                        }

                        p += cfg_len;

                        p += cfg_len;

                        if ((cfg_code & 0x80) == 0)

                        if ((cfg_code & 0x80) == 0)

                        {

                        {