Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd6139a authored by Matias Karhumaa's avatar Matias Karhumaa Committed by Greg Kroah-Hartman
Browse files

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: default avatarMatias Karhumaa <matias.karhumaa@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a059243

net/bluetooth/l2cap_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,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)