commit: 7918237fb06dafdefd25924598ff1ea91f6dc34a Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Mon Jun 10 19:41:47 2019 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Mon Jun 10 19:41:47 2019 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=7918237f
Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758. Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 +++ ...zes-only-if-Secure-Simple-Pairing-enabled.patch | 37 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/0000_README b/0000_README index 3161071..513d8bc 100644 --- a/0000_README +++ b/0000_README @@ -247,6 +247,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. +Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch +From: https://lore.kernel.org/linux-bluetooth/[email protected]/raw +Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 + Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 Desc: Add UAS disable quirk. See bug #640082. diff --git a/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch b/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch new file mode 100644 index 0000000..394ad48 --- /dev/null +++ b/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch @@ -0,0 +1,37 @@ +The encryption is only mandatory to be enforced when both sides are using +Secure Simple Pairing and this means the key size check makes only sense +in that case. + +On legacy Bluetooth 2.0 and earlier devices like mice the encryption was +optional and thus causing an issue if the key size check is not bound to +using Secure Simple Pairing. + +Fixes: d5bb334a8e17 ("Bluetooth: Align minimum encryption key size for LE and BR/EDR connections") +Signed-off-by: Marcel Holtmann <[email protected]> +Cc: [email protected] +--- + net/bluetooth/hci_conn.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c +index 3cf0764d5793..7516cdde3373 100644 +--- a/net/bluetooth/hci_conn.c ++++ b/net/bluetooth/hci_conn.c +@@ -1272,8 +1272,13 @@ int hci_conn_check_link_mode(struct hci_conn *conn) + return 0; + } + +- if (hci_conn_ssp_enabled(conn) && +- !test_bit(HCI_CONN_ENCRYPT, &conn->flags)) ++ /* If Secure Simple Pairing is not enabled, then legacy connection ++ * setup is used and no encryption or key sizes can be enforced. ++ */ ++ if (!hci_conn_ssp_enabled(conn)) ++ return 1; ++ ++ if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags)) + return 0; + + /* The minimum encryption key size needs to be enforced by the +-- +2.20.1
