From: Greg Kroah-Hartman Date: Wed, 3 Jul 2019 12:19:47 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.1.17~57 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03fe8357bba7220640f2929f68d29df16736bc49;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..439e78ccc2e --- /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 +Date: Tue, 2 Jul 2019 16:35:09 +0200 +Subject: Bluetooth: Fix faulty expression for minimum encryption key size check + +From: Matias Karhumaa + +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 +Cc: stable@vger.kernel.org +Signed-off-by: Marcel Holtmann +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 3cbf7c396dc..00961617391 100644 --- 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