aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-03-16 11:02:57 -0400
committerGustavo Padovan <gustavo@padovan.org>2012-05-08 23:41:33 -0400
commitc72d4b8afa8002cd6f64225954bee78296321e7e (patch)
tree2abcb1d54309248e09dae928570d118691f15974 /net
parentd97dcb66001222efa79e55f5260b9b660fd452a4 (diff)
Bluetooth: mgmt: Don't allow to set invalid value to DeviceID source
Reply with MGMT_STATUS_INVALID_PARAMS when userspace is trying to set source with out-of-scope value. Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Acked-by: Gustavo Padovan <gustavo@padovan.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 402cb0026f5d..f590dfbe9e07 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2532,12 +2532,19 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data,
2532{ 2532{
2533 struct mgmt_cp_set_device_id *cp = data; 2533 struct mgmt_cp_set_device_id *cp = data;
2534 int err; 2534 int err;
2535 __u16 source;
2535 2536
2536 BT_DBG("%s", hdev->name); 2537 BT_DBG("%s", hdev->name);
2537 2538
2539 source = __le16_to_cpu(cp->source);
2540
2541 if (source > 0x0002)
2542 return cmd_status(sk, hdev->id, MGMT_OP_SET_DEVICE_ID,
2543 MGMT_STATUS_INVALID_PARAMS);
2544
2538 hci_dev_lock(hdev); 2545 hci_dev_lock(hdev);
2539 2546
2540 hdev->devid_source = __le16_to_cpu(cp->source); 2547 hdev->devid_source = source;
2541 hdev->devid_vendor = __le16_to_cpu(cp->vendor); 2548 hdev->devid_vendor = __le16_to_cpu(cp->vendor);
2542 hdev->devid_product = __le16_to_cpu(cp->product); 2549 hdev->devid_product = __le16_to_cpu(cp->product);
2543 hdev->devid_version = __le16_to_cpu(cp->version); 2550 hdev->devid_version = __le16_to_cpu(cp->version);