Bluetooth: Re-encrypt link after receiving an LTK
Subsystems (2)
PATCH v2 1/2 Bluetooth: Re-encrypt link after receiving an LTK
From: Johan Hedberg <[email protected]>
It's not strictly speaking required to re-encrypt a link once we receive an LTK since the connection is already encrypted with the STK. However, re-encrypting with the LTK allows us to verify that we've received an LTK that actually works.
This patch updates the SMP code to request encrypting with the LTK in case we're in master role and waits until the key refresh complete event before notifying user space of the distributed keys.
--- net/bluetooth/smp.c | 23 ++++++++++++++++++----- net/bluetooth/smp.h | 3 ++- 2 files changed, 20 insertions(+), 6 deletions(-)
net/bluetooth/smp.c +18 -5
@@ -1174,6 +1174,7 @@ int smp_distribute_keys(struct l2cap_conn *conn)struct smp_chan *smp = conn->smp_chan;struct hci_conn *hcon = conn->hcon;struct hci_dev *hdev = hcon->hdev; +bool ltk_encrypt;__u8 *keydist;BT_DBG ("conn %p" , conn);
@@ -1263,12 +1264,24 @@ int smp_distribute_keys(struct l2cap_conn *conn)if ((smp->remote_key_dist &0x07 ))return 0 ; -clear_bit (HCI_CONN_LE_SMP_PEND , &hcon->flags); -cancel_delayed_work_sync (&conn->security_timer); -set_bit (SMP_FLAG_COMPLETE , &smp->smp_flags); -smp_notify_keys (conn); +if (smp->ltk) + ltk_encrypt = !test_and_set_bit (SMP_FLAG_LTK_ENCRYPT , + &smp->smp_flags); +else + ltk_encrypt = false; -smp_chan_destroy (conn); +/* Re-encrypt the link with LTK if possible */ +if (ltk_encrypt && hcon->out) { +struct smp_ltk *ltk = smp->ltk; +hci_le_start_enc (hcon, ltk->ediv, ltk->rand, ltk->val); + hcon->enc_key_size = ltk->enc_size; + }else { +clear_bit (HCI_CONN_LE_SMP_PEND , &hcon->flags); +cancel_delayed_work_sync (&conn->security_timer); +set_bit (SMP_FLAG_COMPLETE , &smp->smp_flags); +smp_notify_keys (conn); +smp_chan_destroy (conn); + }return 0 ; }
net/bluetooth/smp.h +2 -1
@@ -118,7 +118,8 @@ struct smp_cmd_security_req {#define SMP_FLAG_TK_VALID 1#define SMP_FLAG_CFM_PENDING 2#define SMP_FLAG_MITM_AUTH 3 -#define SMP_FLAG_COMPLETE 4 +#define SMP_FLAG_LTK_ENCRYPT 4 +#define SMP_FLAG_COMPLETE 5struct smp_chan {struct l2cap_conn *conn;
Signature · 1 line
1.8.5.3
PATCH v2 2/2 Bluetooth: Fix disconnecting connections in non-connected states
From: Johan Hedberg <[email protected]>
When powering off and disconnecting devices we should also consider connections which have not yet reached the BT_CONNECTED state. They may not have a valid handle yet and simply sending a HCI_Disconnect will not work.
This patch updates the code to either disconnect, cancel connection creation or reject incoming connection creation based on the current conn->state value as well as the link type in question.
When the power off procedure results in canceling connection attempts instead of disconnecting connections we get a connection failed event instead of a disconnection event. Therefore, we also need to have extra code in the mgmt_connect_failed function to check if we should proceed with the power off or not.
--- net/bluetooth/mgmt.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-)
net/bluetooth/mgmt.c +40 -4
@@ -1057,10 +1057,34 @@ static int clean_up_hci_state(struct hci_dev *hdev)list_for_each_entry (conn, &hdev->conn_hash.list, list) {struct hci_cp_disconnect dc; - - dc.handle =cpu_to_le16 (conn->handle); - dc.reason =0x15 ;/* Terminated due to Power Off */ -hci_req_add (&req,HCI_OP_DISCONNECT ,sizeof (dc), &dc); +struct hci_cp_reject_conn_req rej; + +switch (conn->state) { +case BT_CONNECTED : +case BT_CONFIG : + dc.handle =cpu_to_le16 (conn->handle); + dc.reason =0x15 ;/* Terminated due to Power Off */ +hci_req_add (&req,HCI_OP_DISCONNECT ,sizeof (dc), &dc); +break ; +case BT_CONNECT : +if (conn->type ==LE_LINK ) +hci_req_add (&req,HCI_OP_LE_CREATE_CONN_CANCEL , +0 ,NULL ); +else if (conn->type ==ACL_LINK ) +hci_req_add (&req,HCI_OP_CREATE_CONN_CANCEL , +6 , &conn->dst); +break ; +case BT_CONNECT2 : +bacpy (&rej.bdaddr, &conn->dst); + rej.reason =0x15 ;/* Terminated due to Power Off */ +if (conn->type ==ACL_LINK ) +hci_req_add (&req,HCI_OP_REJECT_CONN_REQ , +sizeof (rej), &rej); +else if (conn->type ==SCO_LINK ) +hci_req_add (&req,HCI_OP_REJECT_SYNC_CONN_REQ , +sizeof (rej), &rej); +break ; + } }return hci_req_run (&req, clean_up_hci_complete);
@@ -5182,6 +5206,18 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, u8 addr_type, u8 status) {struct mgmt_ev_connect_failed ev; +struct pending_cmd *power_off; + + power_off =mgmt_pending_find (MGMT_OP_SET_POWERED , hdev); +if (power_off) { +struct mgmt_mode *cp = power_off->param; + +/* The connection is still in hci_conn_hash so test for 1 +* instead of 0 to know if this is the last one. +*/ +if (!cp->val &&hci_conn_count (hdev) ==1 ) +queue_work (hdev->req_workqueue, &hdev->power_off.work); + }bacpy (&ev.addr.bdaddr, bdaddr); ev.addr.type =link_to_bdaddr (link_type, addr_type);
Signature · 1 line
1.8.5.3
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: Fix disconnecting connections in non-connected states
Hi Johan,
Quoted 15 lines
When powering off and disconnecting devices we should also consider connections which have not yet reached the
BT_CONNECTEDstate. They may not have a valid handle yet and simply sending aHCI_Disconnectwill not work.This patch updates the code to either disconnect, cancel connection creation or reject incoming connection creation based on the current
conn->statevalue as well as the link type in question.When the power off procedure results in canceling connection attempts instead of disconnecting connections we get a connection failed event instead of a disconnection event. Therefore, we also need to have extra code in the
mgmt_connect_failedfunction to check if we should proceed with the power off or not.
Quoted 4 lines
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/mgmt.c| 44 ++++++++++++++++++++++++++++++++++++++++----1 file changed, 40 insertions(+), 4 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel