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

Merge branch 'bugfix/access_nullptr_when_ble_disconn_v5.0' into 'release/v5.0'

Browse Source 
Bugfix/Fixed crash caused by accessing nullptr in `btm_acl_disconnected` (v5.0)

See merge request espressif/esp-idf!21879
This commit is contained in:
Wang Meng Yang
2023-02-21 18:18:48 +08:00
parent b94db7a64e 4c6aad37f6
commit 11c65947d8
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
components/bt/host/bluedroid/stack/btm/btm_acl.c
View File

@ -2657,29 +2657,37 @@ void btm_acl_connected(BD_ADDR bda, UINT16 handle, UINT8 link_type, UINT8 enc_mo
*******************************************************************************/ *******************************************************************************/
void btm_acl_disconnected(UINT16 handle, UINT8 reason) void btm_acl_disconnected(UINT16 handle, UINT8 reason)
{ {
BOOLEAN need_report = TRUE;
#if BTM_SCO_INCLUDED == TRUE #if BTM_SCO_INCLUDED == TRUE
/* If L2CAP doesn't know about it, send it to SCO */ /* If L2CAP doesn't know about it, send it to SCO */
if (!l2c_link_hci_disc_comp (handle, reason)) { if (!l2c_link_hci_disc_comp (handle, reason)) {
btm_sco_removed (handle, reason); btm_sco_removed (handle, reason);
need_report = FALSE;
} }
#else #else
/* Report BR/EDR ACL disconnection result to upper layer */
tACL_CONN *conn = btm_handle_to_acl(handle);
#if BLE_INCLUDED == TRUE
if (conn->transport == BT_TRANSPORT_BR_EDR)
#endif
{
tBTM_ACL_LINK_STAT_EVENT_DATA evt_data = {
.event = BTM_ACL_DISCONN_CMPL_EVT,
.link_act.disconn_cmpl.reason = reason,
.link_act.disconn_cmpl.handle = handle,
};
bdcpy(evt_data.link_act.disconn_cmpl.bd_addr, conn->remote_addr);
btm_acl_link_stat_report(&evt_data);
}
l2c_link_hci_disc_comp(handle, reason); l2c_link_hci_disc_comp(handle, reason);
#endif /* BTM_SCO_INCLUDED */ #endif /* BTM_SCO_INCLUDED */
if (need_report) {
/* Report BR/EDR ACL disconnection result to upper layer */
tACL_CONN *conn = btm_handle_to_acl(handle);
if (conn) {
#if BLE_INCLUDED == TRUE
if (conn->transport == BT_TRANSPORT_BR_EDR)
#endif
{
tBTM_ACL_LINK_STAT_EVENT_DATA evt_data = {
.event = BTM_ACL_DISCONN_CMPL_EVT,
.link_act.disconn_cmpl.reason = reason,
.link_act.disconn_cmpl.handle = handle,
};
bdcpy(evt_data.link_act.disconn_cmpl.bd_addr, conn->remote_addr);
btm_acl_link_stat_report(&evt_data);
}
}
}
#if (SMP_INCLUDED == TRUE) #if (SMP_INCLUDED == TRUE)
/* Notify security manager */ /* Notify security manager */
btm_sec_disconnected(handle, reason); btm_sec_disconnected(handle, reason);