As promised here is Greg's patch to revert the commit which has been breaking many people's bluetooth.
--- Begin Message ---
- Subject: Patch "Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections"" has been added to the 5.1-stable tree
- From: <gregkh@xxxxxxxxxxxxxxxxxxx>
- Date: Thu, 13 Jun 2019 09:41:24 +0200
- Cc: <stable-commits@xxxxxxxxxxxxxxx>
- Delivered-to: hdegoede@xxxxxxxxxxxxxxxx
- Delivered-to: hdegoede@xxxxxxxxxx
This is a note to let you know that I've just added the patch titled Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections" to the 5.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch and it can be found in the queue-5.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From cf24ec6fe7cbd3bd0722cb9e7d845b4b818f2275 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> This reverts commit 07e38998a19d72b916c39a983c19134522ae806b 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@xxxxxxxxx> Reported-by: Hans de Goede <hdegoede@xxxxxxxxxx> Cc: Jeremy Cline <jeremy@xxxxxxxxxx> Cc: Marcel Holtmann <marcel@xxxxxxxxxxxx> Cc: Johan Hedberg <johan.hedberg@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 @@ -190,9 +190,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 @@ -1276,14 +1276,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; } Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-5.1/nvmem-core-fix-read-buffer-in-place.patch queue-5.1/dmaengine-idma64-use-actual-device-for-dma-transfers.patch queue-5.1/nvmem-sunxi_sid-support-sid-on-a83t-and-h5.patch queue-5.1/mm-memory_hotplug-release-memory-resource-after-arch.patch queue-5.1/revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch queue-5.1/mips-make-sure-dt-memory-regions-are-valid.patch queue-5.1/revert-drm-nouveau-add-kconfig-option-to-turn-off-nouveau-legacy-contexts.-v3.patch queue-5.1/usb-typec-fusb302-check-vconn-is-off-when-we-start-t.patch queue-5.1/video-imsttfb-fix-potential-null-pointer-dereference.patch
--- End Message ---
_______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
