summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatias Karhumaa <matias.karhumaa@gmail.com>2019-07-02 16:35:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-03 16:09:09 +0800
commiteca94432934fe5f141d084f2e36ee2c0e614cc04 (patch)
treea5e58b32d0607aca43923149f3aa97db03be7434 /net
parent6e692c3b721f30485a9124f93e27a0cb6569116c (diff)
downloadlinux-stable-eca94432934fe5f141d084f2e36ee2c0e614cc04.tar.gz
linux-stable-eca94432934fe5f141d084f2e36ee2c0e614cc04.tar.bz2
linux-stable-eca94432934fe5f141d084f2e36ee2c0e614cc04.zip
Bluetooth: Fix faulty expression for minimum encryption key size check
Fix minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE is also allowed as stated in the comment. This bug caused connection problems with devices having maximum encryption key size of 7 octets (56-bit). Fixes: 693cd8ce3f88 ("Bluetooth: Fix regression with minimum encryption key size alignment") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203997 Signed-off-by: Matias Karhumaa <matias.karhumaa@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9f77432dbe38..5406d7cd46ad 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1353,7 +1353,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon)
* actually encrypted before enforcing a key size.
*/
return (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags) ||
- hcon->enc_key_size > HCI_MIN_ENC_KEY_SIZE);
+ hcon->enc_key_size >= HCI_MIN_ENC_KEY_SIZE);
}
static void l2cap_do_start(struct l2cap_chan *chan)