patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: Controller: Fix reset of is_aux_sched flag

Browse source 
Fix reset of is_aux_sched flag when closing the primary and
auxiliary PDU reception. Without this fix when scan window
is closed there would be duplicate auxiliary release message
generated causing memory corruption.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-12-23 11:46:36 +05:30 committed by Carles Cufí
parent 4d87a7ff15
commit 0748474831
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
View file

@ -1015,6 +1015,8 @@ static void isr_done_cleanup(void *param)
if (lll->is_aux_sched) {
struct node_rx_pdu *node_rx;
lll->is_aux_sched = 0U;
node_rx = ull_pdu_rx_alloc();
LL_ASSERT(node_rx);

21
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
View file

@ -850,6 +850,8 @@ isr_rx_do_close:
* context or auxiliary PDU reception by aux context
*/
if (lll->is_aux_sched) {
lll->is_aux_sched = 0U;
/* Go back to resuming primary channel scanning */
radio_isr_set(lll_scan_isr_resume, lll);
} else {
@ -1214,11 +1216,6 @@ static int isr_rx_pdu(struct lll_scan *lll, struct lll_scan_aux *lll_aux,
ftr->param = lll;
ftr->scan_rsp = lll->lll_aux->state;
/* Auxiliary PDU received by LLL scheduling by scan
* context.
*/
lll->is_aux_sched = 1U;
/* Further auxiliary PDU reception will be chain PDUs */
lll->lll_aux->is_chain_sched = 1U;
} else {
@ -1266,18 +1263,22 @@ static int isr_rx_pdu(struct lll_scan *lll, struct lll_scan_aux *lll_aux,
ull_rx_sched();
/* Increase trx count so as to not generate done extra event
* as a valid Auxiliary PDU node rx is being reported to ULL.
*/
trx_cnt++;
/* Next aux scan is scheduled from LLL, we already handled radio
* disable so prevent caller from doing it again.
*/
if (ftr->aux_lll_sched) {
if (!lll_aux) {
lll->is_aux_sched = 1U;
}
return 0;
}
/* Increase trx count so as to not generate done extra event
* as a valid Auxiliary PDU node rx is being reported to ULL.
*/
trx_cnt++;
return -ECANCELED;
}