diff options
| author | Marcel Holtmann | 2013-10-03 06:31:52 +0200 |
|---|---|---|
| committer | Johan Hedberg | 2013-10-03 08:20:37 +0200 |
| commit | cdba5281b2496ffbca332e006f258951233bf53d (patch) | |
| tree | b625297d11656e4df63031ab6a56f0bddbc21cae /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Fix memory leak with L2CAP signal channels (diff) | |
| download | kernel-qcow2-linux-cdba5281b2496ffbca332e006f258951233bf53d.tar.gz kernel-qcow2-linux-cdba5281b2496ffbca332e006f258951233bf53d.tar.xz kernel-qcow2-linux-cdba5281b2496ffbca332e006f258951233bf53d.zip | |
Bluetooth: Restrict SSP setting changes to BR/EDR enabled controllers
Only when BR/EDR is supported and enabled, allow changing of the SSP
setting. Just checking if the hardware supports SSP is not enough
since it might be the case that BR/EDR is disabled.
In the case that BR/EDR is disabled, but SSP supported by the
controller the not supported error message is now returned.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 3b3ed0522fcf..b09c86b6996a 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1296,11 +1296,15 @@ static int set_ssp(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) { struct mgmt_mode *cp = data; struct pending_cmd *cmd; - u8 val; + u8 val, status; int err; BT_DBG("request for %s", hdev->name); + status = mgmt_bredr_support(hdev); + if (status) + return cmd_status(sk, hdev->id, MGMT_OP_SET_SSP, status); + if (!lmp_ssp_capable(hdev)) return cmd_status(sk, hdev->id, MGMT_OP_SET_SSP, MGMT_STATUS_NOT_SUPPORTED); |