openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: Delay LTK encryption to let remote receive all keys 

Some devices may refuse to re-encrypt with the LTK if they haven't
received all our keys yet. This patch adds a 250ms delay before
attempting re-encryption with the LTK.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2014-02-28 18:10:03 +02:00 committed by Marcel Holtmann
parent 38ccdc9332
commit e3098be40b
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bluetooth/smp.c
View File

@ -549,6 +549,20 @@ static void random_work(struct work_struct *work)
smp_failure(conn, reason); smp_failure(conn, reason);
} }
static void smp_reencrypt(struct work_struct *work)
{
struct smp_chan *smp = container_of(work, struct smp_chan,
reencrypt.work);
struct l2cap_conn *conn = smp->conn;
struct hci_conn *hcon = conn->hcon;
struct smp_ltk *ltk = smp->ltk;
BT_DBG("");
hci_le_start_enc(hcon, ltk->ediv, ltk->rand, ltk->val);
hcon->enc_key_size = ltk->enc_size;
}
static struct smp_chan *smp_chan_create(struct l2cap_conn *conn) static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
{ {
struct smp_chan *smp; struct smp_chan *smp;
@ -559,6 +573,7 @@ static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
INIT_WORK(&smp->confirm, confirm_work); INIT_WORK(&smp->confirm, confirm_work);
INIT_WORK(&smp->random, random_work); INIT_WORK(&smp->random, random_work);
INIT_DELAYED_WORK(&smp->reencrypt, smp_reencrypt);
smp->conn = conn; smp->conn = conn;
conn->smp_chan = smp; conn->smp_chan = smp;
@ -576,6 +591,8 @@ void smp_chan_destroy(struct l2cap_conn *conn)
BUG_ON(!smp); BUG_ON(!smp);
cancel_delayed_work_sync(&smp->reencrypt);
complete = test_bit(SMP_FLAG_COMPLETE, &smp->smp_flags); complete = test_bit(SMP_FLAG_COMPLETE, &smp->smp_flags);
mgmt_smp_complete(conn->hcon, complete); mgmt_smp_complete(conn->hcon, complete);
@ -1287,9 +1304,8 @@ int smp_distribute_keys(struct l2cap_conn *conn)
/* Re-encrypt the link with LTK if possible */ /* Re-encrypt the link with LTK if possible */
if (ltk_encrypt && hcon->out) { if (ltk_encrypt && hcon->out) {
struct smp_ltk *ltk = smp->ltk; queue_delayed_work(hdev->req_workqueue, &smp->reencrypt,
hci_le_start_enc(hcon, ltk->ediv, ltk->rand, ltk->val); SMP_REENCRYPT_TIMEOUT);
hcon->enc_key_size = ltk->enc_size;
} else { } else {
clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags); clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags);
cancel_delayed_work_sync(&conn->security_timer); cancel_delayed_work_sync(&conn->security_timer);

3
net/bluetooth/smp.h
View File

@ -121,6 +121,8 @@ struct smp_cmd_security_req {
#define SMP_FLAG_LTK_ENCRYPT 4 #define SMP_FLAG_LTK_ENCRYPT 4
#define SMP_FLAG_COMPLETE 5 #define SMP_FLAG_COMPLETE 5
#define SMP_REENCRYPT_TIMEOUT msecs_to_jiffies(250)
struct smp_chan { struct smp_chan {
struct l2cap_conn *conn; struct l2cap_conn *conn;
u8 preq[7]; /* SMP Pairing Request */ u8 preq[7]; /* SMP Pairing Request */
@ -140,6 +142,7 @@ struct smp_chan {
unsigned long smp_flags; unsigned long smp_flags;
struct work_struct confirm; struct work_struct confirm;
struct work_struct random; struct work_struct random;
struct delayed_work reencrypt;
}; };
/* SMP Commands */ /* SMP Commands */