Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b83f57 authored by Waldemar Rymarkiewicz's avatar Waldemar Rymarkiewicz Committed by Gustavo Padovan
Browse files

Bluetooth: Ignore key unauthenticated for high security 



High security level for pre v2.1 devices requires combination link key
authenticated by at least 16 digit PIN code.

It's also necessary to update key_type and pin_length when the key
exists and is sufficently secured for the connection as there will be
no link key notify event in that case.

Signed-off-by: default avatarWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 13d39315

net/bluetooth/hci_event.c

+16 −4
Original line number Diff line number Diff line
@@ -2059,13 +2059,25 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff 
	}



	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);



	if (key->type == HCI_LK_UNAUTH_COMBINATION && conn &&

			conn->auth_type != 0xff && (conn->auth_type & 0x01)) {

	if (conn) {

		if (key->type == HCI_LK_UNAUTH_COMBINATION &&

				conn->auth_type != 0xff &&

				(conn->auth_type & 0x01)) {

			BT_DBG("%s ignoring unauthenticated key", hdev->name);

			goto not_found;

		}



		if (key->type == HCI_LK_COMBINATION && key->pin_len < 16 &&

				conn->pending_sec_level == BT_SECURITY_HIGH) {

			BT_DBG("%s ignoring key unauthenticated for high \

							security", hdev->name);

			goto not_found;

		}



		conn->key_type = key->type;

		conn->pin_length = key->pin_len;

	}



	bacpy(&cp.bdaddr, &ev->bdaddr);

	memcpy(cp.link_key, key->val, 16);