4.9-stable patches

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

diff --git a/queue-4.9/bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch b/queue-4.9/bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch
new file mode 100644 (file)
index 0000000..439e78c
--- /dev/null
+++ b/queue-4.9/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.9/series b/queue-4.9/series
index 3cbf7c396dca839be2e0c60612cd3abde7a54cfa..0096161739182fa5bdc6a009e36dfde7b39b2eb5 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -62,3 +62,4 @@ net-check-before-dereferencing-netdev_ops-during-busy-poll.patch
 bpf-udp-avoid-calling-reuseport-s-bpf_prog-from-udp_gro.patch
 bpf-udp-ipv6-avoid-running-reuseport-s-bpf_prog-from-__udp6_lib_err.patch
 tipc-pass-tunnel-dev-as-null-to-udp_tunnel-6-_xmit_skb.patch
+bluetooth-fix-faulty-expression-for-minimum-encryption-key-size-check.patch