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

Commit af92f43d authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am: d50fb96d 

am: 7018225d

Change-Id: Iaccd79bedcb973757fe04daba941074df0ff1bc7
parents 75ebd409 7018225d

system/stack/l2cap/l2c_main.cc

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,10 @@ static void process_l2cap_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
            default:

              /* sanity check option length */

              if ((cfg_len + L2CAP_CFG_OPTION_OVERHEAD) <= cmd_len) {

                if (p + cfg_len > p_next_cmd) {

                  android_errorWriteLog(0x534e4554, "79488381");

                  return;

                }

                p += cfg_len;

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

                  cfg_rej_len += cfg_len + L2CAP_CFG_OPTION_OVERHEAD;