Bluetooth: mgmt: Don't allow to set invalid value to DeviceID source
authorSzymon Janc <szymon.janc@tieto.com>
Fri, 16 Mar 2012 15:02:57 +0000 (16:02 +0100)
committerGustavo Padovan <gustavo@padovan.org>
Wed, 9 May 2012 03:41:33 +0000 (00:41 -0300)
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>
net/bluetooth/mgmt.c

index 402cb0026f5dafc7c6defefaeff27ec3ca2ee393..f590dfbe9e07b691b0187cc6c7b87aa1e87a87d0 100644 (file)
@@ -2532,12 +2532,19 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data,
 {
        struct mgmt_cp_set_device_id *cp = data;
        int err;
+       __u16 source;
 
        BT_DBG("%s", hdev->name);
 
+       source = __le16_to_cpu(cp->source);
+
+       if (source > 0x0002)
+               return cmd_status(sk, hdev->id, MGMT_OP_SET_DEVICE_ID,
+                                 MGMT_STATUS_INVALID_PARAMS);
+
        hci_dev_lock(hdev);
 
-       hdev->devid_source = __le16_to_cpu(cp->source);
+       hdev->devid_source = source;
        hdev->devid_vendor = __le16_to_cpu(cp->vendor);
        hdev->devid_product = __le16_to_cpu(cp->product);
        hdev->devid_version = __le16_to_cpu(cp->version);