feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/spp_send_data_crash' into 'master'

Browse Source 
component_bt: Fix crash when spp sends data

See merge request espressif/esp-idf!18563
This commit is contained in:
Jiang Jiang Jian
2022-06-20 19:56:29 +08:00
parent 692b9980b5 90510fb597
commit cce48ded57
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/bt/host/bluedroid/stack/include/stack/l2c_api.h
View File

@@ -39,6 +39,7 @@
** HCI type(1), len(2), handle(2), L2CAP len(2) and CID(2) => 9 ** HCI type(1), len(2), handle(2), L2CAP len(2) and CID(2) => 9
*/ */
#define L2CAP_MIN_OFFSET 13 /* plus control(2), SDU length(2) */ #define L2CAP_MIN_OFFSET 13 /* plus control(2), SDU length(2) */
#define L2CAP_FCS_LEN 2 /* FCS 0 or 2 bytes */
/* Minimum offset for broadcast needs another two bytes for the PSM */ /* Minimum offset for broadcast needs another two bytes for the PSM */
#define L2CAP_BCST_MIN_OFFSET 11 #define L2CAP_BCST_MIN_OFFSET 11

2
components/bt/host/bluedroid/stack/l2cap/l2c_utils.c
View File

@@ -1559,7 +1559,7 @@ tL2C_CCB *l2cu_allocate_ccb (tL2C_LCB *p_lcb, UINT16 cid)
l2c_fcr_free_timer (p_ccb); l2c_fcr_free_timer (p_ccb);
#endif ///CLASSIC_BT_INCLUDED == TRUE #endif ///CLASSIC_BT_INCLUDED == TRUE
p_ccb->ertm_info.preferred_mode = L2CAP_FCR_BASIC_MODE; /* Default mode for channel is basic mode */ p_ccb->ertm_info.preferred_mode = L2CAP_FCR_BASIC_MODE; /* Default mode for channel is basic mode */
p_ccb->ertm_info.allowed_modes = L2CAP_FCR_CHAN_OPT_BASIC|L2CAP_FCR_CHAN_OPT_BASIC; p_ccb->ertm_info.allowed_modes = L2CAP_FCR_CHAN_OPT_BASIC|L2CAP_FCR_CHAN_OPT_ERTM;
p_ccb->ertm_info.fcr_rx_buf_size = L2CAP_FCR_RX_BUF_SIZE; p_ccb->ertm_info.fcr_rx_buf_size = L2CAP_FCR_RX_BUF_SIZE;
p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_FCR_TX_BUF_SIZE; p_ccb->ertm_info.fcr_tx_buf_size = L2CAP_FCR_TX_BUF_SIZE;
p_ccb->ertm_info.user_rx_buf_size = L2CAP_USER_RX_BUF_SIZE; p_ccb->ertm_info.user_rx_buf_size = L2CAP_USER_RX_BUF_SIZE;

3
components/bt/host/bluedroid/stack/rfcomm/port_api.c
View File

@@ -1552,7 +1552,8 @@ int PORT_WriteDataCO (UINT16 handle, int *p_len, int len, UINT8 *p_data)
length = (UINT16)available; length = (UINT16)available;
} }
UINT16 alloc_size = (UINT16)(sizeof(BT_HDR) + L2CAP_MIN_OFFSET + RFCOMM_DATA_OVERHEAD+length); UINT16 alloc_size = (UINT16)(sizeof(BT_HDR) + L2CAP_MIN_OFFSET + RFCOMM_DATA_OVERHEAD
+ length + L2CAP_FCS_LEN);
p_buf = (BT_HDR *)osi_malloc(alloc_size); p_buf = (BT_HDR *)osi_malloc(alloc_size);
if (!p_buf) { if (!p_buf) {
RFCOMM_TRACE_EVENT ("PORT_WriteDataCO: out of heap."); RFCOMM_TRACE_EVENT ("PORT_WriteDataCO: out of heap.");