commit 671e726537ed02791d4ae242e879c405a8ced165
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 17 18:09:14 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 17 18:09:14 2016 +0000
tree 6e321c4cebc0107cdeee4616f29f3c396930e98b
parent 234af83f69d70dc89a2c7ae6557b8c63f737437b
parent 494b510b9bdf5bf9bb8b74181a8f640e54e6cd40

Merge "Check CCB state before executing channel state machine events"

stack/l2cap/l2c_csm.c

diff --git a/stack/l2cap/l2c_csm.c b/stack/l2cap/l2c_csm.c
index dedffc8..9eac5d5 100644
--- a/stack/l2cap/l2c_csm.c
+++ b/stack/l2cap/l2c_csm.c
@@ -67,6 +67,11 @@
 *******************************************************************************/
 void l2c_csm_execute (tL2C_CCB *p_ccb, UINT16 event, void *p_data)
 {
+    if (!l2cu_is_ccb_active(p_ccb)) {
+        L2CAP_TRACE_WARNING("%s CCB not in use, event (%d) cannot be processed", __func__, event);
+        return;
+    }
+
     switch (p_ccb->chnl_state)
     {
     case CST_CLOSED:

stack/l2cap/l2c_int.h

diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h
index fab7e8f..9c6bf8a 100644
--- a/stack/l2cap/l2c_int.h
+++ b/stack/l2cap/l2c_int.h
@@ -639,6 +639,7 @@
 extern BOOLEAN l2cu_initialize_fixed_ccb (tL2C_LCB *p_lcb, UINT16 fixed_cid, tL2CAP_FCR_OPTS *p_fcr);
 extern void    l2cu_no_dynamic_ccbs (tL2C_LCB *p_lcb);
 extern void    l2cu_process_fixed_chnl_resp (tL2C_LCB *p_lcb);
+extern BOOLEAN l2cu_is_ccb_active (tL2C_CCB *p_ccb);
 
 /* Functions provided by l2c_ucd.c
 ************************************

stack/l2cap/l2c_utils.c

diff --git a/stack/l2cap/l2c_utils.c b/stack/l2cap/l2c_utils.c
index ff6461f..af87c2a 100644
--- a/stack/l2cap/l2c_utils.c
+++ b/stack/l2cap/l2c_utils.c
@@ -3824,3 +3824,17 @@
     }
 }
 
+/*******************************************************************************
+**
+** Function         l2cu_is_ccb_active
+**
+** Description      Check if Channel Control Block is in use or released
+**
+** Returns          BOOLEAN - TRUE if Channel Control Block is in use
+**                            FALSE if p_ccb is null or is released.
+**
+*******************************************************************************/
+BOOLEAN l2cu_is_ccb_active (tL2C_CCB *p_ccb)
+{
+    return (p_ccb && p_ccb->in_use);
+}