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

Bluetooth: GATT: Fix not handling duplicated CCC storage

Browse source 
Some backends may actually contain the same key multiple times so the
code needs to check if there is already a ccc_cfg for an address before
attempting to use one that is unallocated.

Fixes #11409

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2018-11-21 15:49:42 +02:00 committed by Johan Hedberg
parent 046e1ab94a
commit a618ea2a5a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subsys/bluetooth/host/gatt.c
View file

@ -2634,13 +2634,16 @@ static u8_t ccc_load(const struct bt_gatt_attr *attr, void *user_data)
BT_DBG("Restoring CCC: handle 0x%04x value 0x%04x", load->entry->handle,
load->entry->value);
cfg = ccc_find_cfg(ccc, BT_ADDR_LE_ANY);
cfg = ccc_find_cfg(ccc, &load->addr);
if (!cfg) {
BT_DBG("Unable to restore CCC: no cfg left");
goto next;
cfg = ccc_find_cfg(ccc, BT_ADDR_LE_ANY);
if (!cfg) {
BT_DBG("Unable to restore CCC: no cfg left");
goto next;
}
bt_addr_le_copy(&cfg->peer, &load->addr);
}
bt_addr_le_copy(&cfg->peer, &load->addr);
cfg->value = load->entry->value;
next: