[PATCH] Bluetooth: Fix minimum encryption key size check

[PATCH] Bluetooth: Fix minimum encryption key size check

[Matias Karhumaa]

Fixes minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE
is also allowed as stated in comment.

This bug caused connection problems with devices having min
encryption key size of 7.

This patch has been prepared against Linus' tree because previous
regression fix that introduced this bug is not in Bluetooth tree yet.

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
---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.17.1

Re: [PATCH] Bluetooth: Fix minimum encryption key size check

[Marcel Holtmann]

Hi Matias,

> Fixes minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE
> is also allowed as stated in comment.
> 
> This bug caused connection problems with devices having min
> encryption key size of 7.
> 
> This patch has been prepared against Linus' tree because previous
> regression fix that introduced this bug is not in Bluetooth tree yet.
> 
> 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
> ---
> net/bluetooth/l2cap_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been forwarded to Linus.

Regards

Marcel