Home Explore Help
Sign In
PUBLIC_REPOS
/
ti-processor-sdk-linux
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Bluetooth: Fix faulty expression for minimum encryption key size check

commit eca94432934fe5f141d084f2e36ee2c0e614cc04 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Matias Karhumaa 6 years ago
parent
1a05924366
commit
5dd6139a0a
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      net/bluetooth/l2cap_core.c

+ 1 - 1
net/bluetooth/l2cap_core.c
View File 

@@ -1352,7 +1352,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon)
 
 	 * actually encrypted before enforcing a key size.
 
 	 * actually encrypted before enforcing a key size.
 
 	 */
 
 	 */
 
 	return (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags) ||
 
 	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)
 
 static void l2cap_do_start(struct l2cap_chan *chan)