Bluetooth: GATT: Fix not handling duplicated CCC storage (734ee4e5) · Commits · Wenxi XU / zephyr

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>

subsys/bluetooth/host/gatt.c

+4 −1

Changes for subsys/bluetooth/host/gatt.c: 4 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -2551,13 +2551,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, &load->addr);
		if (!cfg) {
		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);
		}

		cfg->value = load->entry->value;

		next:

Admin message