From: Greg Kroah-Hartman Date: Thu, 13 Jun 2019 07:40:20 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.1.10~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0491a95f74dfefa13c4521ef45359561863db954;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch --- diff --git a/queue-4.4/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch b/queue-4.4/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch index 28c2eee61a5..41170c7d9f8 100644 --- a/queue-4.4/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch +++ b/queue-4.4/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch @@ -45,14 +45,12 @@ Cc: Jakob Unterwurzacher Signed-off-by: Miklos Szeredi Signed-off-by: Sasha Levin --- - 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 fbb978e75c6b..217ceca3eb06 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c -@@ -1734,7 +1734,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, +@@ -1724,7 +1724,7 @@ static int fuse_retrieve(struct fuse_con offset = outarg->offset & ~PAGE_CACHE_MASK; file_size = i_size_read(inode); @@ -61,6 +59,3 @@ index fbb978e75c6b..217ceca3eb06 100644 if (outarg->offset > file_size) num = 0; else if (outarg->offset + num > file_size) --- -2.20.1 - diff --git a/queue-4.4/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch b/queue-4.4/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch new file mode 100644 index 00000000000..3b1bfab699e --- /dev/null +++ b/queue-4.4/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 +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 + +This reverts commit d016dc1bd29a2cfb0707fc6fb290ccd21f3b139c 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 +Reported-by: Hans de Goede +Cc: Jeremy Cline +Cc: Marcel Holtmann +Cc: Johan Hedberg +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -174,9 +174,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 +@@ -1177,14 +1177,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.4/series b/queue-4.4/series index 26319bb0519..7d89272215b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -38,3 +38,4 @@ 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 futex-fix-futex-lock-the-wrong-page.patch +revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch