Bluetooth: Fix registering hci with duplicate name

When adding HCI devices hci_register_dev assigns the same name
hci1 for subsequently added AMP devices.

...
[ 6958.381886] sysfs: cannot create duplicate filename
       '/devices/virtual/bluetooth/hci1
...

We assume id starts with the number we'll try to add the new device
and keep iterating until we find the proper place. The only difference
is we start with 0 for BR/EDR device and 1 for AMP devices (thus AMP
devices will never receive register as index 0). Then every hdev->id in
the _ordered_ list <= to the id we want we increment id and move the
variable head. In the end we'll have id as the first available one and
head is where you need to add hdev after to keep the list ordered.

Reported-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Ulisses Furquim <ulisses@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 544c7e3a40d27963fe2c3e580612a29d0dc83ca1..22581823e610e1d8219ee1e4162e0bf7ba7a51ce 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1738,24 +1738,28 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
 /* Register HCI device */
 int hci_register_dev(struct hci_dev *hdev)
 {
-       struct list_head *head = &hci_dev_list, *p;
+       struct list_head *head, *p;
        int i, id, error;
 
        if (!hdev->open || !hdev->close)
                return -EINVAL;
 
+       write_lock(&hci_dev_list_lock);
+
        /* Do not allow HCI_AMP devices to register at index 0,
         * so the index can be used as the AMP controller ID.
         */
        id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
-
-       write_lock(&hci_dev_list_lock);
+       head = &hci_dev_list;
 
        /* Find first available device id */
        list_for_each(p, &hci_dev_list) {
-               if (list_entry(p, struct hci_dev, list)->id != id)
+               int nid = list_entry(p, struct hci_dev, list)->id;
+               if (nid > id)
                        break;
-               head = p; id++;
+               if (nid == id)
+                       id++;
+               head = p;
        }
 
        sprintf(hdev->name, "hci%d", id);
@@ -1763,7 +1767,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
        BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
 
-       list_add_tail(&hdev->list, head);
+       list_add(&hdev->list, head);
 
        mutex_init(&hdev->lock);