OSDN Git Service

Fix out of bounds read in l2c_rcv_acl_data
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 22 Jun 2018 09:57:19 +0000 (02:57 -0700)
committerJakub Pawlowski <jpawlowski@google.com>
Fri, 13 Jul 2018 12:43:24 +0000 (12:43 +0000)
Test: none
Bug: 80432895
Change-Id: I7807d00c02a84c545476e84bc1b71e0718df1f24
Merged-In: I7807d00c02a84c545476e84bc1b71e0718df1f24

stack/l2cap/l2c_main.c

index 59bfdde..cc43666 100644 (file)
@@ -128,7 +128,7 @@ void l2c_rcv_acl_data (BT_HDR *p_msg)
     UINT8       pkt_type;
     tL2C_LCB    *p_lcb;
     tL2C_CCB    *p_ccb = NULL;
-    UINT16      l2cap_len, rcv_cid, psm;
+    UINT16      l2cap_len, rcv_cid;
 
     /* Extract the handle */
     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.pkts", 1);
         /* 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 it is not broadcast, check UCD registration */