michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Avoid removing keys from controller that are not added

Browse source 
Avoid removing identity keys from the controller during the pairing
procedure. During the pairing procedure the keys will be cleared before
they are updated. This causes an unnecessary warning from HCI core where
it tries to remove an IRK key-set from the controller that has has not
been added yet.

While this is not an issue, the warning from HCI core is misleading and
might lead to unnecessary questions and investigations.
Warning appeared after: 6c6bd8c49e

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-03-25 17:28:28 +01:00 • committed by Johan Hedberg
commit 6d9e45a2ee
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/host/hci_core.c
View file

@ -3630,6 +3630,7 @@ void bt_id_add(struct bt_keys *keys)
/* Nothing to be done if host-side resolving is used */
if (!bt_dev.le.rl_size || bt_dev.le.rl_entries > bt_dev.le.rl_size) {
bt_dev.le.rl_entries++;
keys->state |= BT_KEYS_ID_ADDED;
return;
}
@ -3691,6 +3692,7 @@ void bt_id_add(struct bt_keys *keys)
}
bt_dev.le.rl_entries++;
keys->state |= BT_KEYS_ID_ADDED;
goto done;
}
@ -3702,6 +3704,7 @@ void bt_id_add(struct bt_keys *keys)
}
bt_dev.le.rl_entries++;
keys->state |= BT_KEYS_ID_ADDED;
/*
* According to Core Spec. 5.0 Vol 1, Part A 5.4.5 Privacy Feature
@ -3737,7 +3740,7 @@ done:
static void keys_add_id(struct bt_keys *keys, void *data)
{
if (keys != (struct bt_keys *)data) {
if (keys->state & BT_KEYS_ID_ADDED) {
hci_id_add(keys->id, &keys->addr, keys->irk.val);
}
}
@ -3772,6 +3775,7 @@ void bt_id_del(struct bt_keys *keys)
if (!bt_dev.le.rl_size ||
bt_dev.le.rl_entries > bt_dev.le.rl_size + 1) {
bt_dev.le.rl_entries--;
keys->state &= ~BT_KEYS_ID_ADDED;
return;
}
@ -3824,11 +3828,12 @@ void bt_id_del(struct bt_keys *keys)
/* We checked size + 1 earlier, so here we know we can fit again */
if (bt_dev.le.rl_entries > bt_dev.le.rl_size) {
bt_dev.le.rl_entries--;
keys->state &= ~BT_KEYS_ID_ADDED;
if (IS_ENABLED(CONFIG_BT_CENTRAL) &&
IS_ENABLED(CONFIG_BT_PRIVACY)) {
bt_keys_foreach(BT_KEYS_ALL, keys_add_id, keys);
bt_keys_foreach(BT_KEYS_ALL, keys_add_id, NULL);
} else {
bt_keys_foreach(BT_KEYS_IRK, keys_add_id, keys);
bt_keys_foreach(BT_KEYS_IRK, keys_add_id, NULL);
}
goto done;
}
@ -3840,6 +3845,7 @@ void bt_id_del(struct bt_keys *keys)
}
bt_dev.le.rl_entries--;
keys->state &= ~BT_KEYS_ID_ADDED;
done:
/* Only re-enable if there are entries to do resolving with */

3
subsys/bluetooth/host/keys.c
View file

@ -236,8 +236,7 @@ void bt_keys_clear(struct bt_keys *keys)
{
BT_DBG("%s (keys 0x%04x)", bt_addr_le_str(&keys->addr), keys->keys);
if ((IS_ENABLED(CONFIG_BT_CENTRAL) && IS_ENABLED(CONFIG_BT_PRIVACY)) ||
keys->keys & BT_KEYS_IRK) {
if (keys->state & BT_KEYS_ID_ADDED) {
bt_id_del(keys);
}

1
subsys/bluetooth/host/keys.h
View file

@ -22,6 +22,7 @@ enum {
enum {
BT_KEYS_ID_PENDING_ADD = BIT(0),
BT_KEYS_ID_PENDING_DEL = BIT(1),
BT_KEYS_ID_ADDED = BIT(2),
};
enum {