another patch

2 files changed, 56 insertions, 0 deletions

diff --git a/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch b/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch
new file mode 100644
index 0000000..5729b91
--- /dev/null
+++ b/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch
@@ -0,0 +1,55 @@
+From cf24ec6fe7cbd3bd0722cb9e7d845b4b818f2275 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 13 Jun 2019 09:28:42 +0200
+Subject: Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b16a6c99f88c16c9b4f736226b736d0c53320614 which is
+commit d5bb334a8e171b262e48f378bd2096c0ea458265 upstream.
+
+Lots of people have reported issues with this patch, and as there does
+not seem to be a fix going into Linus's kernel tree any time soon,
+revert the commit in the stable trees so as to get people's machines
+working properly again.
+
+Reported-by: Vasily Khoruzhick <anarsoul@gmail.com>
+Reported-by: Hans de Goede <hdegoede@redhat.com>
+Cc: Jeremy Cline <jeremy@jcline.org>
+Cc: Marcel Holtmann <marcel@holtmann.org>
+Cc: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/net/bluetooth/hci_core.h |    3 ---
+ net/bluetooth/hci_conn.c         |    8 --------
+ 2 files changed, 11 deletions(-)
+
+--- a/include/net/bluetooth/hci_core.h
++++ b/include/net/bluetooth/hci_core.h
+@@ -145,9 +145,6 @@ struct oob_data {
+ 
+ #define HCI_MAX_SHORT_NAME_LENGTH	10
+ 
+-/* Min encryption key size to match with SMP */
+-#define HCI_MIN_ENC_KEY_SIZE		7
+-
+ /* Default LE RPA expiry time, 15 minutes */
+ #define HCI_DEFAULT_RPA_TIMEOUT		(15 * 60)
+ 
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -932,14 +932,6 @@ int hci_conn_check_link_mode(struct hci_
+ 	    !test_bit(HCI_CONN_ENCRYPT, &conn->flags))
+ 		return 0;
+ 
+-	/* The minimum encryption key size needs to be enforced by the
+-	 * host stack before establishing any L2CAP connections. The
+-	 * specification in theory allows a minimum of 1, but to align
+-	 * BR/EDR and LE transports, a minimum of 7 is chosen.
+-	 */
+-	if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
+-		return 0;
+-
+ 	return 1;
+ }
+ 
diff --git a/series b/series
index e26230b..9e80e74 100644
--- a/series
+++ b/series
@@ -1 +1,2 @@
 futex-fix-futex-lock-the-wrong-page.patch
+revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch