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

Commit e1061d4b 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: 720d83a8 

Change-Id: Ia857465d9a103a44d6219f90bcf606e23a712166
parents 21eb7b17 720d83a8

system/stack/l2cap/l2c_main.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -128,7 +128,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;





    /* Extract the handle */

    /* Extract the handle */

    STREAM_TO_UINT16 (handle, p);

    STREAM_TO_UINT16 (handle, p);
@@ -239,8 +239,6 @@ void l2c_rcv_acl_data (BT_HDR *p_msg) 
        counter_add("l2cap.ch2.rx.bytes", l2cap_len);

        counter_add("l2cap.ch2.rx.bytes", l2cap_len);

        counter_add("l2cap.ch2.rx.pkts", 1);

        counter_add("l2cap.ch2.rx.pkts", 1);

        /* 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 */