Commit 0d4db6b9 authored by Joakim Andersson's avatar Joakim Andersson Committed by Anas Nashif
Browse files

Bluetooth: host: Verify valid local identity loaded from settings 



Verify that the local identity loaded from the settings key is
valid for the current configuration.

Signed-off-by: default avatarJoakim Andersson <joakim.andersson@nordicsemi.no>
parent e24df527

subsys/bluetooth/host/gatt.c

+24 −3
Original line number Diff line number Diff line
@@ -4757,7 +4757,14 @@ static int ccc_set(const char *name, size_t len_rd, settings_read_cb read_cb, 
		} else if (!next) {

			load.addr_with_id.id = BT_ID_DEFAULT;

		} else {

			load.addr_with_id.id = strtol(next, NULL, 10);

			unsigned long next_id = strtoul(next, NULL, 10);



			if (next_id >= CONFIG_BT_ID_MAX) {

				BT_ERR("Invalid local identity %lu", next_id);

				return -EINVAL;

			}



			load.addr_with_id.id = (uint8_t)next_id;

		}



		err = bt_settings_decode_key(name, &addr);
@@ -5138,7 +5145,14 @@ static int sc_set(const char *name, size_t len_rd, settings_read_cb read_cb, 
	if (!next) {

		id = BT_ID_DEFAULT;

	} else {

		id = strtol(next, NULL, 10);

		unsigned long next_id = strtoul(next, NULL, 10);



		if (next_id >= CONFIG_BT_ID_MAX) {

			BT_ERR("Invalid local identity %lu", next_id);

			return -EINVAL;

		}



		id = (uint8_t)next_id;

	}



	cfg = find_sc_cfg(id, &addr);
@@ -5216,7 +5230,14 @@ static int cf_set(const char *name, size_t len_rd, settings_read_cb read_cb, 
	if (!next) {

		id = BT_ID_DEFAULT;

	} else {

		id = strtol(next, NULL, 10);

		unsigned long next_id = strtoul(next, NULL, 10);



		if (next_id >= CONFIG_BT_ID_MAX) {

			BT_ERR("Invalid local identity %lu", next_id);

			return -EINVAL;

		}



		id = (uint8_t)next_id;

	}



	cfg = find_cf_cfg_by_addr(id, &addr);

subsys/bluetooth/host/keys.c

+8 −1
Original line number Diff line number Diff line
@@ -374,7 +374,14 @@ static int keys_set(const char *name, size_t len_rd, settings_read_cb read_cb, 
	if (!next) {

		id = BT_ID_DEFAULT;

	} else {

		id = strtol(next, NULL, 10);

		unsigned long next_id = strtoul(next, NULL, 10);



		if (next_id >= CONFIG_BT_ID_MAX) {

			BT_ERR("Invalid local identity %lu", next_id);

			return -EINVAL;

		}



		id = (uint8_t)next_id;

	}



	if (!len) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE