From: Marcel Holtmann Date: Mon, 14 Oct 2013 16:55:32 +0000 (-0700) Subject: Bluetooth: Check that scan window is smaller or equal than scan interval X-Git-Tag: accepted/tizen/common/20141203.182822~719^2~3^2^2~364^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=899e107577a8de67b97a877ed90bbfbfefb1916e;p=platform%2Fkernel%2Flinux-arm64.git 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 Signed-off-by: Johan Hedberg --- diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 813012f..861e389 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;