diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-03-24 14:39:07 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-24 07:51:56 -0700 |
| commit | a82505c7bcbc1f8cce28d092aba01f62c7b85fa3 (patch) | |
| tree | ce2807d5ec429c24ccf693c0f6c85e1ed7b8a9fe /net | |
| parent | edca792c036f48b15ee4d70045fb6722e8797281 (diff) | |
| download | linux-stable-a82505c7bcbc1f8cce28d092aba01f62c7b85fa3.tar.gz linux-stable-a82505c7bcbc1f8cce28d092aba01f62c7b85fa3.tar.bz2 linux-stable-a82505c7bcbc1f8cce28d092aba01f62c7b85fa3.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 1b28f5fd798f..b952041bf4ac 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -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); |