Bluetooth: Fix setting local name to the existing value
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 15 Mar 2013 22:07:03 +0000 (17:07 -0500)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Mon, 18 Mar 2013 17:02:05 +0000 (14:02 -0300)
If user space attempts to set the local name to the same value that's
already set we should simply return a direct command complete for this
mgmt command.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/mgmt.c

index 28e5975246c70010575d5a82f15211ebab54f174..15305fa5506713ea1a0a9086c06da0ff26a6f9af 100644 (file)
@@ -2408,6 +2408,17 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,
 
        hci_dev_lock(hdev);
 
+       /* If the old values are the same as the new ones just return a
+        * direct command complete event.
+        */
+       if (!memcmp(hdev->dev_name, cp->name, sizeof(hdev->dev_name)) &&
+           !memcmp(hdev->short_name, cp->short_name,
+                   sizeof(hdev->short_name))) {
+               err = cmd_complete(sk, hdev->id, MGMT_OP_SET_LOCAL_NAME, 0,
+                                  data, len);
+               goto failed;
+       }
+
        memcpy(hdev->short_name, cp->short_name, sizeof(hdev->short_name));
 
        if (!hdev_is_powered(hdev)) {