Commit 9d4c1cc1 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Use hci_conn_hash_lookup_le() when possible 



Use the new hci_conn_hash_lookup_le() API to look up LE connections.
This way we're guaranteed exact matches that also take into account
the address type.

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

net/bluetooth/hci_conn.c

+3 −6
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst, 
	 * attempt, we simply update pending_sec_level and auth_type fields

	 * and return the object found.

	 */

	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);

	conn = hci_conn_hash_lookup_le(hdev, dst, dst_type);

	conn_unfinished = NULL;

	if (conn) {

		if (conn->state == BT_CONNECT &&
@@ -1019,13 +1019,10 @@ static bool is_connected(struct hci_dev *hdev, bdaddr_t *addr, u8 type) 
{

	struct hci_conn *conn;



	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, addr);

	conn = hci_conn_hash_lookup_le(hdev, addr, type);

	if (!conn)

		return false;



	if (conn->dst_type != type)

		return false;



	if (conn->state != BT_CONNECTED)

		return false;
@@ -1098,7 +1095,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst, 
	 * attempt, we simply update pending_sec_level and auth_type fields

	 * and return the object found.

	 */

	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);

	conn = hci_conn_hash_lookup_le(hdev, dst, dst_type);

	if (conn) {

		if (conn->pending_sec_level < sec_level)

			conn->pending_sec_level = sec_level;

net/bluetooth/hci_event.c

+2 −1
Original line number Diff line number Diff line
@@ -1915,7 +1915,8 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, u8 status) 


	hci_dev_lock(hdev);



	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->peer_addr);

	conn = hci_conn_hash_lookup_le(hdev, &cp->peer_addr,

				       cp->peer_addr_type);

	if (!conn)

		goto unlock;

net/bluetooth/mgmt.c

+6 −4
Original line number Diff line number Diff line
@@ -3098,8 +3098,8 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	} else {

		u8 addr_type = le_addr_type(cp->addr.type);



		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK,

					       &cp->addr.bdaddr);

		conn = hci_conn_hash_lookup_le(hdev, &cp->addr.bdaddr,

					       addr_type);

		if (conn) {

			/* Defer clearing up the connection parameters

			 * until closing to give a chance of keeping
@@ -3198,7 +3198,8 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, 
		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,

					       &cp->addr.bdaddr);

	else

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);

		conn = hci_conn_hash_lookup_le(hdev, &cp->addr.bdaddr,

					       le_addr_type(cp->addr.type));



	if (!conn || conn->state == BT_OPEN || conn->state == BT_CLOSED) {

		err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_DISCONNECT,
@@ -3695,7 +3696,8 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
	if (addr->type == BDADDR_BREDR)

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

	else

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);

		conn = hci_conn_hash_lookup_le(hdev, &addr->bdaddr,

					       le_addr_type(addr->type));



	if (!conn) {

		err = mgmt_cmd_complete(sk, hdev->id, mgmt_op,

CRA Git | Maintained and supported by SUSTech CRA and CCSE