Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1905482ybl; Thu, 29 Aug 2019 00:13:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzcMMsE5Pd974v3ylhGzELzahm8ch2p9SobI6fhptUgSZUuM2YnygX1JlRYx7X5rY8Jb7V X-Received: by 2002:a17:902:8d8d:: with SMTP id v13mr8289759plo.137.1567062819723; Thu, 29 Aug 2019 00:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567062819; cv=none; d=google.com; s=arc-20160816; b=N0JBjxjK37Tyzs4lBQ4O7JJRQFPJ89iFpknpgmAGWcbEsvQ1fPF4/fcw23W3qQpFFU CPwphFkB9kmBgQ3Tp3GF6DGcZQe+P+0HvCQejM3xHaKhbyGuo6GDyQcaoDV1w3Bv7Pds CMmBprYSreaHkQe6znuXtBj7wTLnOeo73Mo4mPxrekUu0NRy3bUiO8L3mool82pNt4B1 5OIYMQFvwgMfmtF3zQFNrtcdaPMkGiMTEdm3k3opNnIBumpwFfg9EF9XRYMN5chqEMdb PGYsQy+DR+QSyUQmWr2Ny3yXlE5wJFDXyYCWZUAb2l4lT2RPBGXsXW4AEp7sd75/qy2A zEzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=859b1HlLMF/+lktv9raogY/+ehPmkWA0wa9RokbbRV4=; b=wbOvI4fhtC+ib8QjL1vfd3dNDoOL5lFmQZY+wggzo6dzzWaip2HyLavplbR2LzYTOM Tq4eDRIV7RyMV15vpfrnAIvCA2K7obXDdaIenGdr8OEOELYWNb10rKXS13a12BTVAvJm o5mWN3/ksonN7Q7Ft5+4WnMNRzOYQMY51iKIw9ajhefXJculOiYKZLjQpj/sBh3VtDV2 PJcJyNGedOhebFpInbp6c5l86ZlmnSAl+q9m+UKE6/NLS9Evx+SzVb1Cb6HsrSI/jRlR VoGCxu+9Kgn6BbcNO3lfs0yV3wVSRdw/7+2k8DWTpAq0hAk++uqTSjJ4sU7+8xW9mLEV llvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id br18si1378309pjb.52.2019.08.29.00.13.03; Thu, 29 Aug 2019 00:13:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725782AbfH2HLf (ORCPT + 99 others); Thu, 29 Aug 2019 03:11:35 -0400 Received: from mga05.intel.com ([192.55.52.43]:40563 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbfH2HLe (ORCPT ); Thu, 29 Aug 2019 03:11:34 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2019 00:11:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,442,1559545200"; d="scan'208";a="380678765" Received: from spoorthi-h97m-d3h.iind.intel.com ([10.223.96.21]) by fmsmga005.fm.intel.com with ESMTP; 29 Aug 2019 00:11:25 -0700 From: spoorthix.k@intel.com To: linux-bluetooth@vger.kernel.org Cc: marcel@holtmann.org Subject: [PATCH] Add Support to use Resolving List Date: Thu, 29 Aug 2019 12:52:21 +0530 Message-Id: <1567063341-12330-1-git-send-email-spoorthix.k@intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Spoorthi Ravishankar Koppad As per Core specification 5.0, Vol 2, Part E, Section 7.8.38, following code changes implements LE add device to Resolving List. Signed-off-by: Spoorthi Ravishankar Koppad --- include/net/bluetooth/hci.h | 1 + net/bluetooth/hci_request.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index c36dc1e..99a38cf36 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -420,6 +420,7 @@ enum { #define HCI_LE_SLAVE_FEATURES 0x08 #define HCI_LE_PING 0x10 #define HCI_LE_DATA_LEN_EXT 0x20 +#define HCI_LE_LL_PRIVACY 0x40 #define HCI_LE_PHY_2M 0x01 #define HCI_LE_PHY_CODED 0x08 #define HCI_LE_EXT_ADV 0x10 diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index ca73d36..48a1777 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -665,6 +665,70 @@ void hci_req_add_le_scan_disable(struct hci_request *req) } } +static void add_to_resolve_list(struct hci_request *req, + struct hci_conn_params *params) +{ + struct hci_cp_le_add_to_resolv_list cp; + struct bdaddr_list_with_irk *entry; + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + memset(&cp, 0, sizeof(cp)); + + cp.bdaddr_type = params->addr_type; + bacpy(&cp.bdaddr, ¶ms->addr); + memcpy(entry->peer_irk, cp.peer_irk, 16); + memcpy(entry->local_irk, cp.local_irk, 16); + hci_req_add(req, HCI_OP_LE_ADD_TO_RESOLV_LIST, sizeof(cp), &cp); +} + +static u8 update_resolve_list(struct hci_request *req) +{ + struct hci_dev *hdev = req->hdev; + struct hci_conn_params *params; + struct bdaddr_list *b; + int err; + u8 resolve_list_entries = 0; + + list_for_each_entry(b, &hdev->le_resolv_list, list) { + /* Cannot Remove or add the device to the Resolving list + * whenever there is an outstanding connection. + */ + if (!hci_pend_le_action_lookup(&hdev->pend_le_conns, + &b->bdaddr, b->bdaddr_type) && + !hci_pend_le_action_lookup(&hdev->pend_le_reports, + &b->bdaddr, b->bdaddr_type)) { + struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = b->bdaddr_type; + bacpy(&cp.bdaddr, &b->bdaddr); + + hci_req_add(req, HCI_OP_LE_DEL_FROM_RESOLV_LIST, + sizeof(cp), &cp); + continue; + } + + if (hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) { + /* Add device to resolving list */ + resolve_list_entries++; + add_to_resolve_list(req, params); + } + + if (hci_bdaddr_list_lookup(&hdev->le_resolv_list, + ¶ms->addr, params->addr_type)) + continue; + + if (resolve_list_entries >= hdev->le_resolv_list_size) { + err = smp_generate_rpa(hdev, hdev->irk, &hdev->rpa); + if (err < 0) + BT_ERR("%s failed to generate new RPA", + hdev->name); + } + resolve_list_entries++; + } +} + static void add_to_white_list(struct hci_request *req, struct hci_conn_params *params) { @@ -891,6 +955,14 @@ void hci_req_add_le_passive_scan(struct hci_request *req) (hdev->le_features[0] & HCI_LE_EXT_SCAN_POLICY)) filter_policy |= 0x02; + /* When filter policy is not 0x00 (no whitelist) and 0x01 + * (whitelist enabled) and if LE Privacy is supported in controller + * add the device to resolving list. + */ + if ((filter_policy == 0x02 || filter_policy == 0x03) && + (hci_dev_test_flag(hdev, HCI_LE_LL_PRIVACY))) + update_resolve_list(req); + hci_req_start_scan(req, LE_SCAN_PASSIVE, hdev->le_scan_interval, hdev->le_scan_window, own_addr_type, filter_policy); } -- 1.9.1