espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-09 11:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll: Fix crash when scanning for AUX packets

Browse Source 
When dropping scan for AUX packet we need to make sure to send HCI
report with data truncated flag set whe needed. Otherwise assert is
triggered in ble_ll_scan_aux_data_unref (as this leaves host in
undefined state).
This commit is contained in:
Szymon Janc
2019-10-08 10:08:46 +02:00
parent 5d9caf8ba7
commit 8402a9adc0
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll.h
+1
View File
@@ -199,6 +199,7 @@ STATS_SECT_START(ble_ll_stats)
STATS_SECT_ENTRY(aux_scan_rsp_err)
STATS_SECT_ENTRY(aux_chain_cnt)
STATS_SECT_ENTRY(aux_chain_err)
STATS_SECT_ENTRY(aux_scan_drop)
STATS_SECT_ENTRY(adv_evt_dropped)
STATS_SECT_ENTRY(scan_timer_stopped)
STATS_SECT_ENTRY(scan_timer_restarted)
nimble/controller/include/controller/ble_ll_scan.h
+1
View File
@@ -119,6 +119,7 @@ struct ble_ll_aux_data {
uint8_t evt_type;
struct ble_ll_sched_item sch;
struct ble_ll_ext_adv_report *evt;
struct ble_npl_event ev;
};
struct ble_ll_scan_pdu_data {
nimble/controller/src/ble_ll.c
+1
View File
@@ -205,6 +205,7 @@ STATS_NAME_START(ble_ll_stats)
STATS_NAME(ble_ll_stats, aux_scan_rsp_err)
STATS_NAME(ble_ll_stats, aux_chain_cnt)
STATS_NAME(ble_ll_stats, aux_chain_err)
STATS_NAME(ble_ll_stats, aux_scan_drop)
STATS_NAME(ble_ll_stats, adv_evt_dropped)
STATS_NAME(ble_ll_stats, scan_timer_stopped)
STATS_NAME(ble_ll_stats, scan_timer_restarted)
nimble/controller/src/ble_ll_scan.c
+22 -2
View File
@@ -182,6 +182,26 @@ static struct os_mempool ext_scan_aux_pool;
static int ble_ll_scan_start(struct ble_ll_scan_sm *scansm,
struct ble_ll_sched_item *sch);
static void
ble_ll_aux_scan_drop_event_cb(struct ble_npl_event *ev)
{
struct ble_ll_aux_data *aux_data = ble_npl_event_get_arg(ev);
ble_ll_scan_end_adv_evt(aux_data);
ble_ll_scan_aux_data_unref(aux_data);
}
static void
ble_ll_aux_scan_drop(struct ble_ll_aux_data *aux_data)
{
BLE_LL_ASSERT(aux_data);
STATS_INC(ble_ll_stats, aux_scan_drop);
ble_npl_event_init(&aux_data->ev, ble_ll_aux_scan_drop_event_cb, aux_data);
ble_ll_event_send(&aux_data->ev);
}
static int
ble_ll_aux_scan_cb(struct ble_ll_sched_item *sch)
{
@@ -195,14 +215,14 @@ ble_ll_aux_scan_cb(struct ble_ll_sched_item *sch)
* just drop the scheduled item
*/
if (!scansm->scan_enabled || scansm->cur_aux_data) {
ble_ll_scan_aux_data_unref(sch->cb_arg);
ble_ll_aux_scan_drop(sch->cb_arg);
sch->cb_arg = NULL;
goto done;
}
/* Check if there is no aux connect sent. If so drop the sched item */
if (lls == BLE_LL_STATE_INITIATING && ble_ll_conn_init_pending_aux_conn_rsp()) {
ble_ll_scan_aux_data_unref(sch->cb_arg);
ble_ll_aux_scan_drop(sch->cb_arg);
sch->cb_arg = NULL;
goto done;
}