diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-04-11 12:02:31 -0700 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 12:04:43 +0800 |
| commit | 4e1d2c9677105fa14ef8aa581acae4e779de2840 (patch) | |
| tree | c65ac22179b98a428d97ce61afb6c4b7be9c81bf /net | |
| parent | b5061cdceb69ceaa3b083467b404dfe5bf58a45e (diff) | |
Bluetooth: Fix triggering BR/EDR L2CAP Connect too early
commit 9eb1fbfa0a737fd4d3a6d12d71c5ea9af622b887 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_event.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 60828cf02eb..66ada7794ed 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3006,6 +3006,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; |