bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Controller: Fix missing connection handle invalidate

Browse Source 
Fix missing connection handle invalidate on Controller
power up.

The connection context are zero-initialized on startup and
calls to `ll_connected_get()` would incorrectly return a
valid connection context pointer for connection handle 0.

Relates to commit fa02dc4d02 ("Bluetooth: Controller: Fix
missing reset of connection handle").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2025-05-05 12:57:46 +02:00 committed by Benjamin Cabé
parent 2ef1ddea73
commit a396bdd30a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subsys/bluetooth/controller/ll_sw/ull_conn.c
View File

@ -781,6 +781,7 @@ int ull_conn_reset(void)
(void)ull_central_reset();
#endif /* CONFIG_BT_CENTRAL */
/* Stop any active ticker related to connection roles */
for (handle = 0U; handle < CONFIG_BT_MAX_CONN; handle++) {
disable(handle);
}
@ -1667,6 +1668,14 @@ static int init_reset(void)
mem_init(conn_pool, sizeof(struct ll_conn),
sizeof(conn_pool) / sizeof(struct ll_conn), &conn_free);
/* Invalidate connection handles, refer to ll_connected_get() */
for (uint16_t handle = 0U; handle < CONFIG_BT_MAX_CONN; handle++) {
struct ll_conn *conn;
conn = ll_conn_get(handle);
conn->lll.handle = LLL_HANDLE_INVALID;
}
/* Initialize tx pool. */
mem_init(mem_conn_tx.pool, CONN_TX_BUF_SIZE, CONN_DATA_BUFFERS,
&mem_conn_tx.free);
@ -1836,7 +1845,6 @@ static inline void disable(uint16_t handle)
conn, &conn->lll);
LL_ASSERT_INFO2(err == 0 || err == -EALREADY, handle, err);
conn->lll.handle = LLL_HANDLE_INVALID;
conn->lll.link_tx_free = NULL;
}