michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Initialize private channel object members

Browse source 
We own those fields, so we should initialize them before use.

Signed-off-by: Jonathan Rico <jonathan.rico@nordicsemi.no>
This commit is contained in:
Jonathan Rico 2024-08-12 10:11:03 +02:00 • committed by Fabio Baltieri
commit 73572e4151
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
subsys/bluetooth/host/l2cap.c
View file

@ -331,6 +331,23 @@ void bt_l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
LOG_DBG("conn %p chan %p", conn, chan); LOG_DBG("conn %p chan %p", conn, chan);
} }
static void init_le_chan_private(struct bt_l2cap_le_chan *le_chan)
{
/* Initialize private members of the struct. We can't "just memset" as
* some members are used as application parameters.
*/
#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
le_chan->_sdu = NULL;
le_chan->_sdu_len = 0;
#if defined(CONFIG_BT_L2CAP_SEG_RECV)
le_chan->_sdu_len_done = 0;
#endif /* CONFIG_BT_L2CAP_SEG_RECV */
#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
memset(&le_chan->_pdu_ready, 0, sizeof(le_chan->_pdu_ready));
le_chan->_pdu_ready_lock = 0;
le_chan->_pdu_remaining = 0;
}
static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan, static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
bt_l2cap_chan_destroy_t destroy) bt_l2cap_chan_destroy_t destroy)
{ {
@ -348,6 +365,7 @@ static bool l2cap_chan_add(struct bt_conn *conn, struct bt_l2cap_chan *chan,
} }
atomic_clear(chan->status); atomic_clear(chan->status);
init_le_chan_private(le_chan);
bt_l2cap_chan_add(conn, chan, destroy); bt_l2cap_chan_add(conn, chan, destroy);