]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Bluetooth: Fix regression with minimum encryption key size alignment
authorMarcel Holtmann <marcel@holtmann.org>
Sat, 22 Jun 2019 13:47:01 +0000 (15:47 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jun 2019 16:07:39 +0000 (09:07 -0700)
commit693cd8ce3f882524a5d06f7800dd8492411877b3
tree4dd842b6a37f1e1c5d0af000c6bdc6267dcd45b3
parentc356dc4b540edd6c02b409dd8cf3208ba2804c38
Bluetooth: Fix regression with minimum encryption key size alignment

When trying to align the minimum encryption key size requirement for
Bluetooth connections, it turns out doing this in a central location in
the HCI connection handling code is not possible.

Original Bluetooth version up to 2.0 used a security model where the
L2CAP service would enforce authentication and encryption.  Starting
with Bluetooth 2.1 and Secure Simple Pairing that model has changed into
that the connection initiator is responsible for providing an encrypted
ACL link before any L2CAP communication can happen.

Now connecting Bluetooth 2.1 or later devices with Bluetooth 2.0 and
before devices are causing a regression.  The encryption key size check
needs to be moved out of the HCI connection handling into the L2CAP
channel setup.

To achieve this, the current check inside hci_conn_security() has been
moved into l2cap_check_enc_key_size() helper function and then called
from four decisions point inside L2CAP to cover all combinations of
Secure Simple Pairing enabled devices and device using legacy pairing
and legacy service security model.

Fixes: d5bb334a8e17 ("Bluetooth: Align minimum encryption key size for LE and BR/EDR connections")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203643
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
net/bluetooth/hci_conn.c
net/bluetooth/l2cap_core.c