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

Commit 490cb0b3 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Restrict long term keys to public and static addresses 



The long term keys should be associated with an identity address. Valid
identity addresses are public addresses or static addresses. So only
allow these two as valid address information for long term keys.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 9113bfd8

net/bluetooth/mgmt.c

+13 −3
Original line number Diff line number Diff line
@@ -4162,11 +4162,21 @@ static bool ltk_is_valid(struct mgmt_ltk_info *key) 
{

	if (key->master != 0x00 && key->master != 0x01)

		return false;

	if (!bdaddr_type_is_le(key->addr.type))



	switch (key->addr.type) {

	case BDADDR_LE_PUBLIC:

		return true;



	case BDADDR_LE_RANDOM:

		/* Two most significant bits shall be set */

		if ((key->addr.bdaddr.b[5] & 0xc0) != 0xc0)

			return false;

		return true;

	}



	return false;

}



static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,

			       void *cp_data, u16 len)

{