Bluetooth: Use unresolvable private address for active scanning

When running active scanning during LE discovery, do not reveal the own
identity to the peer devices. In case LE privacy has been enabled, then
a resolvable private address is used. If the LE privacy option is off,
then use an unresolvable private address.

The public address or static random address is never used in active
scanning anymore. This ensures that scan request are send using a
random address.

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

1 files changed, 17 insertions, 1 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 80462a126ebd..31e68ade309d 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3332,7 +3332,8 @@ static void le_scan_disable_work(struct work_struct *work)
                 BT_ERR("Disable LE scanning request failed: err %d", err);
 }
 
-int hci_update_random_address(struct hci_request *req, u8 *own_addr_type)
+int hci_update_random_address(struct hci_request *req, bool require_privacy,
+                              u8 *own_addr_type)
 {
         struct hci_dev *hdev = req->hdev;
         int err;
@@ -3365,6 +3366,21 @@ int hci_update_random_address(struct hci_request *req, u8 *own_addr_type)
                 return 0;
         }
 
+        /* In case of required privacy without resolvable private address,
+         * use an unresolvable private address. This is useful for active
+         * scanning and non-connectable advertising.
+         */
+        if (require_privacy) {
+                bdaddr_t urpa;
+
+                get_random_bytes(&urpa, 6);
+                urpa.b[5] &= 0x3f;      /* Clear two most significant bits */
+
+                *own_addr_type = ADDR_LE_DEV_RANDOM;
+                hci_req_add(req, HCI_OP_LE_SET_RANDOM_ADDR, 6, &urpa);
+                return 0;
+        }
+
         /* If forcing static address is in use or there is no public
          * address use the static address as random address (but skip
          * the HCI command if the current random address is already the