Commit 3769030f authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Anas Nashif
Browse files

Bluetooth: GATT: Fix not resetting CCC storage 

If there are no CCC to be stored the value should be set to NULL so it
is properly cleared otherwise calling settings_str_from_bytes will leave
str uninitialized which may cause a crash when attempting to load the
value.

Fixes #11564

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent bb07b4d3

subsys/bluetooth/host/gatt.c

+16 −9
Changes for subsys/bluetooth/host/gatt.c: 16 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -2436,14 +2436,6 @@ int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr) 


	bt_gatt_foreach_attr(0x0001, 0xffff, ccc_save, &save);



	str = settings_str_from_bytes(save.store,

				      save.count * sizeof(*save.store),

				      val, sizeof(val));

	if (!str) {

		BT_ERR("Unable to encode CCC as handle:value");

		return -EINVAL;

	}



	if (id) {

		char id_str[4];
@@ -2455,6 +2447,21 @@ int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr) 
				       (bt_addr_le_t *)addr, NULL);

	}



	if (!save.count) {

		/* No entries to encode just clear */

		str = NULL;

		goto save;

	}



	str = settings_str_from_bytes(save.store,

				      save.count * sizeof(*save.store),

				      val, sizeof(val));

	if (!str) {

		BT_ERR("Unable to encode CCC as handle:value");

		return -EINVAL;

	}



save:

	err = settings_save_one(key, str);

	if (err) {

		BT_ERR("Failed to store CCCs (err %d)", err);
@@ -2462,7 +2469,7 @@ int bt_gatt_store_ccc(u8_t id, const bt_addr_le_t *addr) 
	}



	BT_DBG("Stored CCCs for %s (%s) val %s", bt_addr_le_str(addr), key,

	       str);

	       str ? str : "nill");



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE