Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e5483ae authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Bluetooth: Align minimum encryption key size for LE and BR/EDR connections" 



This reverts commit 38f092c4 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: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: Jeremy Cline <jeremy@jcline.org>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 526972e9

include/net/bluetooth/hci_core.h

+0 −3
Original line number Diff line number Diff line
@@ -182,9 +182,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)

net/bluetooth/hci_conn.c

+0 −8
Original line number Diff line number Diff line
@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn) 
	    !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;

}