4.14-stable patches

added patches:
	bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch

diff --git a/queue-4.14/bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch b/queue-4.14/bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch
new file mode 100644 (file)
index 0000000..439e78c
--- /dev/null
+++ b/queue-4.14/bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch
@@ -0,0 +1,38 @@
+From eca94432934fe5f141d084f2e36ee2c0e614cc04 Mon Sep 17 00:00:00 2001
+From: Matias Karhumaa <matias.karhumaa@gmail.com>
+Date: Tue, 2 Jul 2019 16:35:09 +0200
+Subject: Bluetooth: Fix faulty expression for minimum encryption key size check
+
+From: Matias Karhumaa <matias.karhumaa@gmail.com>
+
+commit eca94432934fe5f141d084f2e36ee2c0e614cc04 upstream.
+
+Fix minimum encryption key size check so that HCI_MIN_ENC_KEY_SIZE is
+also allowed as stated in the comment.
+
+This bug caused connection problems with devices having maximum
+encryption key size of 7 octets (56-bit).
+
+Fixes: 693cd8ce3f88 ("Bluetooth: Fix regression with minimum encryption key size alignment")
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203997
+Signed-off-by: Matias Karhumaa <matias.karhumaa@gmail.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/bluetooth/l2cap_core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bluetooth/l2cap_core.c
++++ b/net/bluetooth/l2cap_core.c
+@@ -1352,7 +1352,7 @@ static bool l2cap_check_enc_key_size(str
+        * actually encrypted before enforcing a key size.
+        */
+       return (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags) ||
+-              hcon->enc_key_size > HCI_MIN_ENC_KEY_SIZE);
++              hcon->enc_key_size >= HCI_MIN_ENC_KEY_SIZE);
+ }
+ 
+ static void l2cap_do_start(struct l2cap_chan *chan)

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..bf8cff4
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1 @@
+bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..1aed859
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1,7 @@
+bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch
+block-fix-a-null-pointer-dereference-in-generic_make_request.patch
+md-raid0-do-not-bypass-blocking-queue-entered-for-raid0-bios.patch
+netfilter-nf_flow_table-ignore-df-bit-setting.patch
+netfilter-nft_flow_offload-set-liberal-tracking-mode-for-tcp.patch
+netfilter-nft_flow_offload-don-t-offload-when-sequence-numbers-need-adjustment.patch
+netfilter-nft_flow_offload-ipcb-is-only-valid-for-ipv4-family.patch

diff --git a/queue-5.1/series b/queue-5.1/series
new file mode 100644 (file)
index 0000000..f5f641f
--- /dev/null
+++ b/queue-5.1/series
@@ -0,0 +1,6 @@
+bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch
+signal-remove-the-wrong-signal_pending-check-in-restore_user_sigmask.patch
+netfilter-nf_flow_table-ignore-df-bit-setting.patch
+netfilter-nft_flow_offload-set-liberal-tracking-mode-for-tcp.patch
+netfilter-nft_flow_offload-don-t-offload-when-sequence-numbers-need-adjustment.patch
+netfilter-nft_flow_offload-ipcb-is-only-valid-for-ipv4-family.patch