michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Don't reuse RX buffers to respond

Browse source 
This causes num of packets command handling to dead lock since it
is done on RX buffer destroy if used on TX it may not be destroyed
on time causing.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2017-07-12 14:33:47 +03:00 • committed by Johan Hedberg
commit 16e6abbcfb
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -352,7 +352,7 @@ static struct net_buf *l2cap_create_le_sig_pdu(struct net_buf *buf,
{ {
struct bt_l2cap_sig_hdr *hdr; struct bt_l2cap_sig_hdr *hdr;
buf = bt_l2cap_create_rsp(buf, 0); buf = bt_l2cap_create_pdu(NULL, 0);
hdr = net_buf_add(buf, sizeof(*hdr)); hdr = net_buf_add(buf, sizeof(*hdr));
hdr->code = code; hdr->code = code;
@ -445,20 +445,6 @@ void bt_l2cap_encrypt_change(struct bt_conn *conn, u8_t hci_status)
} }
} }
struct net_buf *bt_l2cap_create_rsp(struct net_buf *buf, size_t reserve)
{
if (!buf || buf->frags || buf->flags) {
return bt_l2cap_create_pdu(NULL, 0);
}
net_buf_ref(buf);
/* Reset len so buffer can be reused */
net_buf_reset(buf);
net_buf_reserve(buf, BT_L2CAP_CHAN_SEND_RESERVE + reserve);
return buf;
}
struct net_buf *bt_l2cap_create_pdu(struct net_buf_pool *pool, size_t reserve) struct net_buf *bt_l2cap_create_pdu(struct net_buf_pool *pool, size_t reserve)
{ {
return bt_conn_create_pdu(pool, sizeof(struct bt_l2cap_hdr) + reserve); return bt_conn_create_pdu(pool, sizeof(struct bt_l2cap_hdr) + reserve);