diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2015-01-22 11:15:22 -0800 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-01-22 21:44:20 +0200 |
| commit | ed93ec69c7e0e80d733dced5b73af0f23cc3b061 (patch) | |
| tree | 492efc044ec516438d9be699af0000e7f3314b45 /net/bluetooth | |
| parent | 3a5486e1fdb0da7a18788f40b17d351af90d0ea7 (diff) | |
| download | linux-stable-ed93ec69c7e0e80d733dced5b73af0f23cc3b061.tar.gz linux-stable-ed93ec69c7e0e80d733dced5b73af0f23cc3b061.tar.bz2 linux-stable-ed93ec69c7e0e80d733dced5b73af0f23cc3b061.zip | |
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/mgmt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index e86b8d9105e9..41e30055bae8 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -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); |