diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-14 18:55:32 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-14 20:35:47 +0200 |
| commit | 899e107577a8de67b97a877ed90bbfbfefb1916e (patch) | |
| tree | 41f80f4a002967bc6d4f5750bd652e4cf439e708 /net | |
| parent | Bluetooth: Check that bind() bdaddr type matches connect() (diff) | |
| download | linux-899e107577a8de67b97a877ed90bbfbfefb1916e.tar.xz linux-899e107577a8de67b97a877ed90bbfbfefb1916e.zip | |
Bluetooth: Check that scan window is smaller or equal than scan interval
The scan window parameter for connection establishment and passive
scanning needs to be smaller or equal than the scan interval.
Instead of waiting for a controller to reject these values later on,
just reject them right away.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 813012f5032e..861e389f4b4c 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -3493,6 +3493,10 @@ static int set_scan_params(struct sock *sk, struct hci_dev *hdev, return cmd_status(sk, hdev->id, MGMT_OP_SET_SCAN_PARAMS, MGMT_STATUS_INVALID_PARAMS); + if (window > interval) + return cmd_status(sk, hdev->id, MGMT_OP_SET_SCAN_PARAMS, + MGMT_STATUS_INVALID_PARAMS); + hci_dev_lock(hdev); hdev->le_scan_interval = interval; |