summaryrefslogtreecommitdiff
path: root/system/test-kernel/0124-bluetooth-keysize-check.patch
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-01-06 19:29:54 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2022-05-01 17:05:54 -0500
commit6108a4f026838e289ab7bb990ee8311d3092e09b (patch)
tree61d1670c206c0f1c17013926e4f3012226c0adfd /system/test-kernel/0124-bluetooth-keysize-check.patch
parentff32e1e943d15a805615ccdd84ec40e4b540daff (diff)
downloadpackages-6108a4f026838e289ab7bb990ee8311d3092e09b.tar.gz
packages-6108a4f026838e289ab7bb990ee8311d3092e09b.tar.bz2
packages-6108a4f026838e289ab7bb990ee8311d3092e09b.tar.xz
packages-6108a4f026838e289ab7bb990ee8311d3092e09b.zip
system/test-kernel [WIP 5.15]: new package. fixes #429, #430.
Diffstat (limited to 'system/test-kernel/0124-bluetooth-keysize-check.patch')
-rw-r--r--system/test-kernel/0124-bluetooth-keysize-check.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/system/test-kernel/0124-bluetooth-keysize-check.patch b/system/test-kernel/0124-bluetooth-keysize-check.patch
new file mode 100644
index 000000000..394ad48fc
--- /dev/null
+++ b/system/test-kernel/0124-bluetooth-keysize-check.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 <marcel@holtmann.org>
+Cc: stable@vger.kernel.org
+---
+ 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