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

Commit 0b6251d3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Fix out of bounds read in l2c_rcv_acl_data am: 22651ae3 am:... 

[automerger] Fix out of bounds read in l2c_rcv_acl_data am: 22651ae3 am: d331b7d1 am: 0a43fa41

Change-Id: I80b0aa3927f54a56c87ecad76351a075c5478c7b
parents c1d75053 0a43fa41

system/stack/l2cap/l2c_main.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) 
    UINT8       pkt_type;

    UINT8       pkt_type;

    tL2C_LCB    *p_lcb;

    tL2C_LCB    *p_lcb;

    tL2C_CCB    *p_ccb = NULL;

    tL2C_CCB    *p_ccb = NULL;

    UINT16      l2cap_len, rcv_cid, psm;

    UINT16      l2cap_len, rcv_cid;

    UINT16      credit;

    UINT16      credit;





    /* Extract the handle */

    /* Extract the handle */
@@ -185,8 +185,6 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) 
    else if (rcv_cid == L2CAP_CONNECTIONLESS_CID)

    else if (rcv_cid == L2CAP_CONNECTIONLESS_CID)

    {

    {

        /* process_connectionless_data (p_lcb); */

        /* process_connectionless_data (p_lcb); */

        STREAM_TO_UINT16 (psm, p);

        L2CAP_TRACE_DEBUG( "GOT CONNECTIONLESS DATA PSM:%d", psm ) ;





#if (L2CAP_UCD_INCLUDED == TRUE)

#if (L2CAP_UCD_INCLUDED == TRUE)

        /* if it is not broadcast, check UCD registration */

        /* if it is not broadcast, check UCD registration */