diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-17 22:25:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-17 22:25:51 -0700 |
| commit | 1dbb2413cbfa7db7a337081af1f4119996522156 (patch) | |
| tree | a7f6df47570b5a416e22ef3f0223fc6d769cde00 /net | |
| parent | 34f5b0066435ffb793049b84fafd29fa195bcf90 (diff) | |
| parent | d8949aad3eab5d396f4fefcd581773bf07b9a79e (diff) | |
| download | linux-1dbb2413cbfa7db7a337081af1f4119996522156.tar.gz linux-1dbb2413cbfa7db7a337081af1f4119996522156.tar.bz2 linux-1dbb2413cbfa7db7a337081af1f4119996522156.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2015-09-17
Here's one important patch for the 4.3-rc series that fixes an issue
with Bluetooth LE encryption failing because of a too early check for
the SMP context.
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index ad82324f710f..0510a577a7b5 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -2311,12 +2311,6 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level) if (!conn) return 1; - chan = conn->smp; - if (!chan) { - BT_ERR("SMP security requested but not available"); - return 1; - } - if (!hci_dev_test_flag(hcon->hdev, HCI_LE_ENABLED)) return 1; @@ -2330,6 +2324,12 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level) if (smp_ltk_encrypt(conn, hcon->pending_sec_level)) return 0; + chan = conn->smp; + if (!chan) { + BT_ERR("SMP security requested but not available"); + return 1; + } + l2cap_chan_lock(chan); /* If SMP is already in progress ignore this request */ |