michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Properly remove peer IRKs from RL

Browse source 
When removing a device from the resolving list, if it contained a peer
IRK then it is necessary to update the indices that point to the peer
IRK list, since the list itself is contiguous in memory.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-06-25 17:44:49 +02:00 • committed by Johan Hedberg
commit 343a916d48
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
subsys/bluetooth/controller/ll_sw/ll_filter.c
View file

@ -561,12 +561,25 @@ u32_t ll_rl_remove(bt_addr_le_t *id_addr)
/* find the device and mark it as empty */ /* find the device and mark it as empty */
i = ll_rl_find(id_addr->type, id_addr->a.val); i = ll_rl_find(id_addr->type, id_addr->a.val);
if (i >= 0) { if (i >= 0) {
int j; int j, k;
if (rl[i].pirk) { if (rl[i].pirk) {
int idx = rl[i].pirk_idx; /* Swap with last item */
memmove(peer_irks[idx], peer_irks[idx + 1], int pi = rl[i].pirk_idx, pj = peer_irk_count - 1;
16 * peer_irk_count--);
if (pj && pi != pj) {
memcpy(peer_irks[pi], peer_irks[pj], 16);
for (k = 0;
k < CONFIG_BLUETOOTH_CONTROLLER_RL_SIZE;
k++) {
if (rl[k].taken && rl[k].pirk &&
rl[k].pirk_idx == pj) {
rl[k].pirk_idx = pi;
break;
}
}
}
} }
/* Check if referenced by a whitelist entry */ /* Check if referenced by a whitelist entry */