[PATCH 1/2] Bluetooth: Fix connecting devices during LE device discovery

[PATCH 1/2] Bluetooth: Fix connecting devices during LE device discovery

[johan.hedberg]

From: Johan Hedberg <johan.hedberg@intel.com>

If we have devices set as to be connected we should connect to them even
during normal discovery if we get a connectable advertising event. If we
also have HCI_CONNECTABLE set we should connect ADV_DIRECT_IND events
even to devices that we don't have in our pend_le_conns list. This patch
implements such behavior by passing the advertising report type to
check_pending_le_conn() and calls that function regardless of what type
of scanning we are doing.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 net/bluetooth/hci_event.c | 51 ++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 57837cad9919..1c4f667cc8a1 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4229,13 +4229,26 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,
 
 /* This function requires the caller holds hdev->lock */
 static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
-				  u8 addr_type)
+				  u8 addr_type, u8 adv_type)
 {
 	struct hci_conn *conn;
 
+	/* If the event is not connectable don't proceed further */
+	if (adv_type != LE_ADV_IND && adv_type != LE_ADV_DIRECT_IND)
+		return false;
+
+	/* If we're connectable, always connect any ADV_DIRECT_IND event */
+	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
+	    adv_type == LE_ADV_DIRECT_IND)
+		goto connect;
+
+	/* If we're not connectable only connect devices that we have in
+	 * our pend_le_conns list.
+	 */
 	if (!hci_pend_le_action_lookup(&hdev->pend_le_conns, addr, addr_type))
 		return false;
 
+connect:
 	conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
 			      HCI_AT_NO_BONDING, HCI_LE_AUTOCONN_TIMEOUT);
 	if (!IS_ERR(conn))
@@ -4260,34 +4273,32 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
 			       u8 bdaddr_type, s8 rssi, u8 *data, u8 len)
 {
 	struct discovery_state *d = &hdev->discovery;
-	bool match;
+	bool match, pend_conn;
+	struct smp_irk *irk;
 	u32 flags;
 
+	/* Check if we need to convert to identity address */
+	irk = hci_get_irk(hdev, bdaddr, bdaddr_type);
+	if (irk) {
+		bdaddr = &irk->bdaddr;
+		bdaddr_type = irk->addr_type;
+	}
+
+	/* Ignore if the device is blocked */
+	if (hci_blacklist_lookup(hdev, bdaddr, bdaddr_type))
+		return;
+
+	/* Check if we have been requested to connect to this device */
+	pend_conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type);
+
 	/* Passive scanning shouldn't trigger any device found events,
 	 * except for devices marked as CONN_REPORT for which we do send
 	 * device found events.
 	 */
 	if (hdev->le_scan_type == LE_SCAN_PASSIVE) {
 		struct hci_conn_params *param;
-		struct smp_irk *irk;
-
-		/* Check if we need to convert to identity address */
-		irk = hci_get_irk(hdev, bdaddr, bdaddr_type);
-		if (irk) {
-			bdaddr = &irk->bdaddr;
-			bdaddr_type = irk->addr_type;
-		}
-
-		/* Ignore if the device is blocked */
-		if (hci_blacklist_lookup(hdev, bdaddr, bdaddr_type))
-			return;
-
-		if (type == LE_ADV_IND || type == LE_ADV_DIRECT_IND) {
-			if (check_pending_le_conn(hdev, bdaddr, bdaddr_type))
-				return;
-		}
 
-		if (type == LE_ADV_DIRECT_IND)
+		if (pend_conn || type == LE_ADV_DIRECT_IND)
 			return;
 
 		param = hci_pend_le_action_lookup(&hdev->pend_le_reports,
-- 
1.9.3

[PATCH 2/2] Bluetooth: Remove redundant IRK lookup in mgmt_device_found()

[johan.hedberg]

From: Johan Hedberg <johan.hedberg@intel.com>

Now that we have the process_adv_report() function doing the IRK lookup
and updating the bdaddr we don't need to do this anymore in mgmt.c in
the mgmt_device_found() function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
 net/bluetooth/mgmt.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index be91d55c258b..40244fc0e326 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6717,7 +6717,6 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
 {
 	char buf[512];
 	struct mgmt_ev_device_found *ev = (void *) buf;
-	struct smp_irk *irk;
 	size_t ev_size;
 
 	/* Don't send events for a non-kernel initiated discovery. With
@@ -6739,15 +6738,8 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
 
 	memset(buf, 0, sizeof(buf));
 
-	irk = hci_get_irk(hdev, bdaddr, addr_type);
-	if (irk) {
-		bacpy(&ev->addr.bdaddr, &irk->bdaddr);
-		ev->addr.type = link_to_bdaddr(link_type, irk->addr_type);
-	} else {
-		bacpy(&ev->addr.bdaddr, bdaddr);
-		ev->addr.type = link_to_bdaddr(link_type, addr_type);
-	}
-
+	bacpy(&ev->addr.bdaddr, bdaddr);
+	ev->addr.type = link_to_bdaddr(link_type, addr_type);
 	ev->rssi = rssi;
 	ev->flags = cpu_to_le32(flags);
 
-- 
1.9.3

Re: [PATCH 1/2] Bluetooth: Fix connecting devices during LE device discovery

[Marcel Holtmann]

Hi Johan,

> If we have devices set as to be connected we should connect to them even
> during normal discovery if we get a connectable advertising event. If we
> also have HCI_CONNECTABLE set we should connect ADV_DIRECT_IND events
> even to devices that we don't have in our pend_le_conns list. This patch
> implements such behavior by passing the advertising report type to
> check_pending_le_conn() and calls that function regardless of what type
> of scanning we are doing.
> 
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/hci_event.c | 51 ++++++++++++++++++++++++++++-------------------
> 1 file changed, 31 insertions(+), 20 deletions(-)
> 
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index 57837cad9919..1c4f667cc8a1 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -4229,13 +4229,26 @@ static void hci_le_conn_update_complete_evt(struct hci_dev *hdev,
> 
> /* This function requires the caller holds hdev->lock */
> static bool check_pending_le_conn(struct hci_dev *hdev, bdaddr_t *addr,
> -				  u8 addr_type)
> +				  u8 addr_type, u8 adv_type)
> {
> 	struct hci_conn *conn;
> 
> +	/* If the event is not connectable don't proceed further */
> +	if (adv_type != LE_ADV_IND && adv_type != LE_ADV_DIRECT_IND)
> +		return false;
> +
> +	/* If we're connectable, always connect any ADV_DIRECT_IND event */
> +	if (test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
> +	    adv_type == LE_ADV_DIRECT_IND)
> +		goto connect;
> +
> +	/* If we're not connectable only connect devices that we have in
> +	 * our pend_le_conns list.
> +	 */
> 	if (!hci_pend_le_action_lookup(&hdev->pend_le_conns, addr, addr_type))
> 		return false;
> 
> +connect:
> 	conn = hci_connect_le(hdev, addr, addr_type, BT_SECURITY_LOW,
> 			      HCI_AT_NO_BONDING, HCI_LE_AUTOCONN_TIMEOUT);
> 	if (!IS_ERR(conn))
> @@ -4260,34 +4273,32 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
> 			       u8 bdaddr_type, s8 rssi, u8 *data, u8 len)
> {
> 	struct discovery_state *d = &hdev->discovery;
> -	bool match;
> +	bool match, pend_conn;
> +	struct smp_irk *irk;
> 	u32 flags;
> 
> +	/* Check if we need to convert to identity address */
> +	irk = hci_get_irk(hdev, bdaddr, bdaddr_type);
> +	if (irk) {
> +		bdaddr = &irk->bdaddr;
> +		bdaddr_type = irk->addr_type;
> +	}
> +
> +	/* Ignore if the device is blocked */
> +	if (hci_blacklist_lookup(hdev, bdaddr, bdaddr_type))
> +		return;

I am not sure that this one is correct. So in case of Start Discovery, we will now no longer report blocked devices. I do not think that is what we want.

The blacklist is for connections that come without user interaction. An active discovery should report this and also a Pair Device or L2CAP connect() triggered by the user should be possible.

Especially since when looking at BR/EDR, we do report devices from inquiry and allow outgoing connections.

Regards

Marcel