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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index de338d576907..19834f524a7b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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,