Bluetooth: Fix connection if directed advertising and privacy is used

author Szymon Janc <szymon.janc@codecoup.pl>

Tue, 3 Apr 2018 11:40:06 +0000 (13:40 +0200)

committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thu, 19 Apr 2018 06:56:19 +0000 (08:56 +0200)
author Szymon Janc <szymon.janc@codecoup.pl>
Tue, 3 Apr 2018 11:40:06 +0000 (13:40 +0200)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Apr 2018 06:56:19 +0000 (08:56 +0200)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h

index 95ccc1eef558459b088b4146f0b6b822fb1aec0c..b619a190ff1283a9bd43379c6dc54d4d8617dc4c 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -895,7 +895,7 @@ struct hci_conn *hci_connect_le_scan(struct hci_dev *hdev, bdaddr_t *dst,
                                      u16 conn_timeout);
  struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
                                 u8 dst_type, u8 sec_level, u16 conn_timeout,
-                               u8 role);
+                               u8 role, bdaddr_t *direct_rpa);
  struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
                                  u8 sec_level, u8 auth_type);
  struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c

index dc59eae5471788e42091ba7fc907585d36e99c2d..cc061495f6535264870e00dd4177478b290eee13 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -749,18 +749,31 @@ static bool conn_use_rpa(struct hci_conn *conn)
  }
  
  static void hci_req_add_le_create_conn(struct hci_request *req,
-                                      struct hci_conn *conn)
+                                      struct hci_conn *conn,
+                                      bdaddr_t *direct_rpa)
  {
         struct hci_cp_le_create_conn cp;
         struct hci_dev *hdev = conn->hdev;
         u8 own_addr_type;
  
-       /* Update random address, but set require_privacy to false so
-        * that we never connect with an non-resolvable address.
+       /* If direct address was provided we use it instead of current
+        * address.
          */
-       if (hci_update_random_address(req, false, conn_use_rpa(conn),
-                                     &own_addr_type))
-               return;
+       if (direct_rpa) {
+               if (bacmp(&req->hdev->random_addr, direct_rpa))
+                       hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6,
+                                                               direct_rpa);
+
+               /* direct address is always RPA */
+               own_addr_type = ADDR_LE_DEV_RANDOM;
+       } else {
+               /* Update random address, but set require_privacy to false so
+                * that we never connect with an non-resolvable address.
+                */
+               if (hci_update_random_address(req, false, conn_use_rpa(conn),
+                                             &own_addr_type))
+                       return;
+       }
  
         memset(&cp, 0, sizeof(cp));
  
@@ -825,7 +838,7 @@ static void hci_req_directed_advertising(struct hci_request *req,
  
  struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
                                 u8 dst_type, u8 sec_level, u16 conn_timeout,
-                               u8 role)
+                               u8 role, bdaddr_t *direct_rpa)
  {
         struct hci_conn_params *params;
         struct hci_conn *conn;
@@ -940,7 +953,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
                 hci_dev_set_flag(hdev, HCI_LE_SCAN_INTERRUPTED);
         }
  
-       hci_req_add_le_create_conn(&req, conn);
+       hci_req_add_le_create_conn(&req, conn, direct_rpa);
  
  create_conn:
         err = hci_req_run(&req, create_le_conn_complete);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c

index 0b4dba08a14ec584f5c4fd84e42e21866efa360c..01f211e31f477628993bf26aaa1cf547e0ee32cf 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4646,7 +4646,8 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,
  /* This function requires the caller holds hdev->lock */
  static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
                                               bdaddr_t *addr,
-                                             u8 addr_type, u8 adv_type)
+                                             u8 addr_type, u8 adv_type,
+                                             bdaddr_t *direct_rpa)
  {
         struct hci_conn *conn;
         struct hci_conn_params *params;
@@ -4697,7 +4698,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,
         }
  
         conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
-                             HCI_LE_AUTOCONN_TIMEOUT, HCI_ROLE_MASTER);
+                             HCI_LE_AUTOCONN_TIMEOUT, HCI_ROLE_MASTER,
+                             direct_rpa);
         if (!IS_ERR(conn)) {
                 /* If HCI_AUTO_CONN_EXPLICIT is set, conn is already owned
                  * by higher layer that tried to connect, if no then
@@ -4807,8 +4809,13 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
                 bdaddr_type = irk->addr_type;
         }
  
-       /* Check if we have been requested to connect to this device */
-       conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type);
+       /* Check if we have been requested to connect to this device.
+        *
+        * direct_addr is set only for directed advertising reports (it is NULL
+        * for advertising reports) and is already verified to be RPA above.
+        */
+       conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type,
+                                                               direct_addr);
         if (conn && type == LE_ADV_IND) {
                 /* Store report for later inclusion by
                  * mgmt_device_connected
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c

index fc6615d5916524c446a9f4f952f2f8b7b5b67e16..9b7907ebfa01b0332be1528b507465c1a304ebe6 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7156,7 +7156,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
                         hcon = hci_connect_le(hdev, dst, dst_type,
                                               chan->sec_level,
                                               HCI_LE_CONN_TIMEOUT,
-                                             HCI_ROLE_SLAVE);
+                                             HCI_ROLE_SLAVE, NULL);
                 else
                         hcon = hci_connect_le_scan(hdev, dst, dst_type,
                                                    chan->sec_level,
author	Szymon Janc <szymon.janc@codecoup.pl>
	Tue, 3 Apr 2018 11:40:06 +0000 (13:40 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 19 Apr 2018 06:56:19 +0000 (08:56 +0200)
include/net/bluetooth/hci_core.h		patch \| blob \| blame \| history
net/bluetooth/hci_conn.c		patch \| blob \| blame \| history
net/bluetooth/hci_event.c		patch \| blob \| blame \| history
net/bluetooth/l2cap_core.c		patch \| blob \| blame \| history