Commit c6e81e9a authored Sep 05, 2014 by Johan Hedberg Committed by Marcel Holtmann Sep 08, 2014

Bluetooth: Fix calling smp_distribute_keys() when still waiting for keys



When we're in the process of receiving keys in phase 3 of SMP we keep
track of which keys are still expected in the smp->remote_key_dist
variable. If we still have some key bits set we need to continue waiting
for more PDUs and not needlessly call smp_distribute_keys(). This patch
fixes two such cases in the smp_cmd_master_ident() and
smp_cmd_ident_addr_info() handler functions.

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

parent 88d3a8ac

net/bluetooth/smp.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1293,7 +1293,7 @@ static int smp_cmd_master_ident(struct l2cap_conn conn, struct sk_buff skb)
		authenticated, smp->tk, smp->enc_key_size,
		rp->ediv, rp->rand);
		smp->ltk = ltk;
		if (!(smp->remote_key_dist & SMP_DIST_ID_KEY))
		if (!(smp->remote_key_dist & KEY_DIST_MASK))
		smp_distribute_keys(smp);
		hci_dev_unlock(hdev);

		@@ -1371,6 +1371,7 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,
		smp->id_addr_type, smp->irk, &rpa);

		distribute:
		if (!(smp->remote_key_dist & KEY_DIST_MASK))
		smp_distribute_keys(smp);

		hci_dev_unlock(hcon->hdev);