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

Commit ed93ec69 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Require SSP enabling before BR/EDR Secure Connections 



When BR/EDR is supported by a controller, then it is required to enable
Secure Simple Pairing first before enabling the Secure Connections
feature.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 3a5486e1

net/bluetooth/mgmt.c

+5 −0
Original line number Diff line number Diff line
@@ -4758,6 +4758,11 @@ static int set_secure_conn(struct sock *sk, struct hci_dev *hdev, 
		return cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,

				  MGMT_STATUS_NOT_SUPPORTED);



	if (test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags) &&

	    !test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))

		return cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,

				  MGMT_STATUS_REJECTED);



	if (cp->val != 0x00 && cp->val != 0x01 && cp->val != 0x02)

		return cmd_status(sk, hdev->id, MGMT_OP_SET_SECURE_CONN,

				  MGMT_STATUS_INVALID_PARAMS);