summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-04-11 12:02:31 -0700
committerJohan Hedberg <johan.hedberg@intel.com>2014-04-25 09:47:15 +0300
commit9eb1fbfa0a737fd4d3a6d12d71c5ea9af622b887 (patch)
treed57f0f40f004ee2ba15575ce579161b46025c826 /net
parent3c49aa852e00978ba2f1a4d1e4598a0c669a5347 (diff)
downloadlinux-stable-9eb1fbfa0a737fd4d3a6d12d71c5ea9af622b887.tar.gz
linux-stable-9eb1fbfa0a737fd4d3a6d12d71c5ea9af622b887.tar.bz2
linux-stable-9eb1fbfa0a737fd4d3a6d12d71c5ea9af622b887.zip
Bluetooth: Fix triggering BR/EDR L2CAP Connect too early
Commit 1c2e004183178 introduced an event handler for the encryption key refresh complete event with the intent of fixing some LE/SMP cases. However, this event is shared with BR/EDR and there we actually want to act only on the auth_complete event (which comes after the key refresh). If we do not do this we may trigger an L2CAP Connect Request too early and cause the remote side to return a security block error. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 49774912cb01..15010a230b6d 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3330,6 +3330,12 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
if (!conn)
goto unlock;
+ /* For BR/EDR the necessary steps are taken through the
+ * auth_complete event.
+ */
+ if (conn->type != LE_LINK)
+ goto unlock;
+
if (!ev->status)
conn->sec_level = conn->pending_sec_level;