From: Matias Karhumaa Date: Tue, 2 Jul 2019 14:35:09 +0000 (+0200) Subject: Bluetooth: Fix faulty expression for minimum encryption key size check X-Git-Tag: v4.9.185~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f470557724f2c94c25e4f6480a41612cf42aff26;p=platform%2Fkernel%2Flinux-amlogic.git 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 Cc: stable@vger.kernel.org Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c5efed428c39..ec9b5d159591 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -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)