Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-27 07:05:49 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-27 07:05:49 +0200
commit21481fcef51d1be602351e629270bb920ba5b7ab (patch)
tree0aa278de8fe6e8c9d4339e70fbcabb6056706986
parente1ea65f452081a6ebe96795a67d9e562180e923a (diff)
parent34f7e5f2d9d946db6605041a44b8885f74a13bc9 (diff)
Merge branch 'SLE12-SP4' into SLE12-SP4-AZURE
-rw-r--r--patches.suse/RFC-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pairing-is-enabled.patch42
-rw-r--r--series.conf2
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.suse/RFC-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pairing-is-enabled.patch b/patches.suse/RFC-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pairing-is-enabled.patch
new file mode 100644
index 0000000000..15772982c9
--- /dev/null
+++ b/patches.suse/RFC-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pairing-is-enabled.patch
@@ -0,0 +1,42 @@
+From: Marcel Holtmann <marcel@holtmann.org>
+Subject: [RFC] Bluetooth: Check key sizes only when Secure Simple Pairing is enabled
+Date: Wed, 22 May 2019 09:05:40 +0200
+Message-id: <20190522070540.48895-1-marcel@holtmann.org>
+Patch-mainline: No, RFC
+References: bsc#1135556
+
+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
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ net/bluetooth/hci_conn.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -1148,8 +1148,13 @@ int hci_conn_check_link_mode(struct hci_
+ 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
diff --git a/series.conf b/series.conf
index dd05ff742b..2d5d2ddf9c 100644
--- a/series.conf
+++ b/series.conf
@@ -22965,6 +22965,8 @@
patches.suse/ath10k-QCA9377-firmware-limit.patch
patches.kabi/bt_accept_enqueue-kabi-workaround.patch
+ patches.suse/RFC-Bluetooth-Check-key-sizes-only-when-Secure-Simple-Pairing-is-enabled.patch
+
########################################################
# ISDN
########################################################