Commit b7d448d7 authored Feb 18, 2014 by Johan Hedberg Committed by Marcel Holtmann Feb 18, 2014

Bluetooth: Fix completing SMP as peripheral when no keys are expected



When we're the acceptors (peripheral/slave) of an SMP procedure and
we've completed distributing our keys we should only stick around
waiting for keys from the remote side if any of the initiator
distribution bits were actually set. This patch fixes the
smp_distribute_keys function to clear the SMP context when this
situation occurs.

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

parent c51ffa0b

net/bluetooth/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1175,7 +1175,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
		*keydist &= ~SMP_DIST_SIGN;
		}

		if (conn->hcon->out \|\| force) {
		if (conn->hcon->out \|\| force \|\| !(rsp->init_key_dist & 0x07)) {
		clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags);
		cancel_delayed_work_sync(&conn->security_timer);
		smp_chan_destroy(conn);

Admin message