OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Fix locking in blacklist code 

There was no unlock call on the errors path

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan 2011-06-17 16:15:10 -03:00
parent e2ab43536c
commit a7925bd27d
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/bluetooth/hci_core.c
View File

@ -1241,47 +1241,59 @@ int hci_blacklist_clear(struct hci_dev *hdev)
int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr) int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)
{ {
struct bdaddr_list *entry; struct bdaddr_list *entry;
int err;
hci_dev_lock(hdev);
if (bacmp(bdaddr, BDADDR_ANY) == 0) if (bacmp(bdaddr, BDADDR_ANY) == 0)
return -EBADF; return -EBADF;
if (hci_blacklist_lookup(hdev, bdaddr)) hci_dev_lock(hdev);
return -EEXIST;
if (hci_blacklist_lookup(hdev, bdaddr)) {
err = -EEXIST;
goto err;
}
entry = kzalloc(sizeof(struct bdaddr_list), GFP_KERNEL); entry = kzalloc(sizeof(struct bdaddr_list), GFP_KERNEL);
if (!entry) if (!entry) {
return -ENOMEM; return -ENOMEM;
goto err;
}
bacpy(&entry->bdaddr, bdaddr); bacpy(&entry->bdaddr, bdaddr);
list_add(&entry->list, &hdev->blacklist); list_add(&entry->list, &hdev->blacklist);
hci_dev_unlock(hdev); err = 0;
return 0; err:
hci_dev_unlock(hdev);
return err;
} }
int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr) int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)
{ {
struct bdaddr_list *entry; struct bdaddr_list *entry;
int err = 0;
hci_dev_lock(hdev); hci_dev_lock(hdev);
if (bacmp(bdaddr, BDADDR_ANY) == 0) if (bacmp(bdaddr, BDADDR_ANY) == 0) {
return hci_blacklist_clear(hdev); hci_blacklist_clear(hdev);
goto done;
}
entry = hci_blacklist_lookup(hdev, bdaddr); entry = hci_blacklist_lookup(hdev, bdaddr);
if (!entry) if (!entry) {
return -ENOENT; err = -ENOENT;
goto done;
}
list_del(&entry->list); list_del(&entry->list);
kfree(entry); kfree(entry);
done:
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
return err;
return 0;
} }
static void hci_clear_adv_cache(unsigned long arg) static void hci_clear_adv_cache(unsigned long arg)