4.9-stable patches

added patches:
	revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch

diff --git a/queue-4.9/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch b/queue-4.9/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
index 0dd3b3ad1e4ab2d7aab0d32e37b7b5ae2baed85b..167686ee33a1064add9c85172a2736a133c88195 100644 (file)
--- a/queue-4.9/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
+++ b/queue-4.9/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
@@ -45,14 +45,12 @@ Cc: Jakob Unterwurzacher <jakobunt@gmail.com>
 Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/fuse/dev.c | 2 +-
+ fs/fuse/dev.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index bc2d4832f02b..3331a5aae49a 100644
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
-@@ -1678,7 +1678,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
+@@ -1668,7 +1668,7 @@ static int fuse_retrieve(struct fuse_con
        offset = outarg->offset & ~PAGE_MASK;
        file_size = i_size_read(inode);
  
@@ -61,6 +59,3 @@ index bc2d4832f02b..3331a5aae49a 100644
        if (outarg->offset > file_size)
                num = 0;
        else if (outarg->offset + num > file_size)
--- 
-2.20.1
-

diff --git a/queue-4.9/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch b/queue-4.9/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch
new file mode 100644 (file)
index 0000000..a128ab4
--- /dev/null
+++ b/queue-4.9/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 745f5c5f2ac14ac1cbb7fe3cbdc893c9d1af1356 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
+@@ -176,9 +176,6 @@ struct adv_info {
+ 
+ #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
+@@ -1165,14 +1165,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/queue-4.9/series b/queue-4.9/series
index d3b8ff75ec349e78369622e79f8cbfb668c4756b..6ba609013fb8ce3d7d32f83a676ecac540d36979 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -54,3 +54,4 @@ pwm-tiehrpwm-update-shadow-register-for-disabling-pw.patch
 arm-dts-exynos-always-enable-necessary-apio_1v8-and-.patch
 pwm-fix-deadlock-warning-when-removing-pwm-device.patch
 arm-exynos-fix-undefined-instruction-during-exynos54.patch
+revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch