Skip to contentSkip to conversation

Bluetooth: Fix faulty expression for minimum encryption key size check

PATCH New Marcel Holtmann 1 participant 1 message Jul 2, 2019

Subsystems (2)
lore
Share & tools
lore

Marcel Holtmann

author maintainer
#0 lore raw

PATCH 1/1 Bluetooth: Fix faulty expression for minimum encryption key size check

From: Matias Karhumaa <[email protected]>

Fixes 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

---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
index 9f77432dbe38..5406d7cd46ad 100644
@@ -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)
Signature · 1 line
2.20.1