Commit a82505c7 authored Mar 24, 2014 by Johan Hedberg Committed by Marcel Holtmann Mar 24, 2014

Bluetooth: Don't try to confirm locally initiated SMP pairing



In the case that the just-works model would be triggered we only want to
confirm remotely initiated pairings (i.e. those triggered by a Security
Request or Pairing Request). This patch adds the necessary check to the
tk_request function to fall back to the JUST_WORKS method in the case of
a locally initiated pairing.

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

parent edca792c

net/bluetooth/smp.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -387,6 +387,11 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
		if (!(auth & SMP_AUTH_BONDING) && method == JUST_CFM)
		method = JUST_WORKS;

		/* Don't confirm locally initiated pairing attempts */
		if (method == JUST_CFM && test_bit(SMP_FLAG_INITIATOR,
		&smp->smp_flags))
		method = JUST_WORKS;

		/* If Just Works, Continue with Zero TK */
		if (method == JUST_WORKS) {
		set_bit(SMP_FLAG_TK_VALID, &smp->smp_flags);