Bluetooth: Add initial code for distributing local IRK

This code adds a HCI_PRIVACY flag to track whether Privacy support is
enabled (meaning we have a local IRK) and makes sure the IRK is
distributed during SMP key distribution in case this flag is set.

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

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index fe4b06bfc150f5a5a8dcd4a421dac8d8fdbb4d54..5ff885ff29df29a7a02c4d8e6af696515790a40c 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -126,6 +126,7 @@ enum {
        HCI_SSP_ENABLED,
        HCI_SC_ENABLED,
        HCI_SC_ONLY,
+       HCI_PRIVACY,
        HCI_RPA_RESOLVING,
        HCI_HS_ENABLED,
        HCI_LE_ENABLED,

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c0fcc041fbb5e36b70306a4872de05207ad193c1..68bbcabdd9fd8d97e18a7e5db7fa5824821ad363 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -303,6 +303,8 @@ struct hci_dev {
        __u8                    scan_rsp_data[HCI_MAX_AD_LENGTH];
        __u8                    scan_rsp_data_len;
 
+       __u8                    irk[16];
+
        int (*open)(struct hci_dev *hdev);
        int (*close)(struct hci_dev *hdev);
        int (*flush)(struct hci_dev *hdev);

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 6355a460e9d0415f499d7a68a727989145f4fffc..8ef50c790b962f855f4a4509ce37e213281e06ff 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -265,6 +265,9 @@ static void build_pairing_cmd(struct l2cap_conn *conn,
        if (test_bit(HCI_RPA_RESOLVING, &hdev->dev_flags))
                remote_dist |= SMP_DIST_ID_KEY;
 
+       if (test_bit(HCI_PRIVACY, &hdev->dev_flags))
+               local_dist |= SMP_DIST_ID_KEY;
+
        if (rsp == NULL) {
                req->io_capability = conn->hcon->io_capability;
                req->oob_flag = SMP_OOB_NOT_PRESENT;
@@ -1189,8 +1192,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
                struct smp_cmd_ident_addr_info addrinfo;
                struct smp_cmd_ident_info idinfo;
 
-               /* Send a dummy key */
-               get_random_bytes(idinfo.irk, sizeof(idinfo.irk));
+               memcpy(idinfo.irk, hdev->irk, sizeof(idinfo.irk));
 
                smp_send_cmd(conn, SMP_CMD_IDENT_INFO, sizeof(idinfo), &idinfo);