Bluetooth: Refactor valid LTK data testing into its own function (3f706b72) · Commits · 戴 / test

This patch refactors valid LTK data testing into its own function. This will help keep the code readable since there are several tests still missing that need to be done on the LTK data. Signed-off-by:

Johan Hedberg <johan.hedberg@intel.com> Acked-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Gustavo Padovan <gustavo.padovan@collabora.co.uk>

net/bluetooth/mgmt.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -2701,6 +2701,13 @@ done:
		return err;
		}

		static bool ltk_is_valid(struct mgmt_ltk_info *key)
		{
		if (key->master != 0x00 && key->master != 0x01)
		return false;
		return true;
		}

		static int load_long_term_keys(struct sock sk, struct hci_dev hdev,
		void *cp_data, u16 len)
		{
		@@ -2724,7 +2731,7 @@ static int load_long_term_keys(struct sock sk, struct hci_dev hdev,
		for (i = 0; i < key_count; i++) {
		struct mgmt_ltk_info *key = &cp->keys[i];

		if (key->master != 0x00 && key->master != 0x01)
		if (!ltk_is_valid(key))
		return cmd_status(sk, hdev->id,
		MGMT_OP_LOAD_LONG_TERM_KEYS,
		MGMT_STATUS_INVALID_PARAMS);

Admin message