Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a66aad authored by Antti Julku's avatar Antti Julku Committed by Gustavo Padovan
Browse files

Bluetooth: Move blacklisting functions to hci_core 



Move blacklisting functions to hci_core.c, so that they can
be used by both management interface and hci socket interface.

Signed-off-by: default avatarAntti Julku <antti.julku@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 3158c50c

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -529,6 +529,8 @@ int hci_inquiry(void __user *arg); 


struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);

int hci_blacklist_clear(struct hci_dev *hdev);

int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr);

int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr);



int hci_uuids_clear(struct hci_dev *hdev);

net/bluetooth/hci_core.c

+79 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,85 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash, 
	return 0;

}



struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,

						bdaddr_t *bdaddr)

{

	struct list_head *p;



	list_for_each(p, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);



		if (bacmp(bdaddr, &b->bdaddr) == 0)

			return b;

	}



	return NULL;

}



int hci_blacklist_clear(struct hci_dev *hdev)

{

	struct list_head *p, *n;



	list_for_each_safe(p, n, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);



		list_del(p);

		kfree(b);

	}



	return 0;

}



int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct bdaddr_list *entry;



	hci_dev_lock(hdev);



	if (bacmp(bdaddr, BDADDR_ANY) == 0)

		return -EBADF;



	if (hci_blacklist_lookup(hdev, bdaddr))

		return -EEXIST;



	entry = kzalloc(sizeof(struct bdaddr_list), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	bacpy(&entry->bdaddr, bdaddr);



	list_add(&entry->list, &hdev->blacklist);



	hci_dev_unlock(hdev);



	return 0;

}



int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct bdaddr_list *entry;



	hci_dev_lock(hdev);



	if (bacmp(bdaddr, BDADDR_ANY) == 0)

		return hci_blacklist_clear(hdev);



	entry = hci_blacklist_lookup(hdev, bdaddr);

	if (!entry)

		return -ENOENT;



	list_del(&entry->list);

	kfree(entry);



	hci_dev_unlock(hdev);



	return 0;

}



static void hci_clear_adv_cache(unsigned long arg)

{

	struct hci_dev *hdev = (void *) arg;

net/bluetooth/hci_sock.c

+6 −64
Original line number Diff line number Diff line
@@ -180,82 +180,24 @@ static int hci_sock_release(struct socket *sock) 
	return 0;

}



struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr)

{

	struct list_head *p;



	list_for_each(p, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);



		if (bacmp(bdaddr, &b->bdaddr) == 0)

			return b;

	}



	return NULL;

}



static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg)

static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)

{

	bdaddr_t bdaddr;

	struct bdaddr_list *entry;



	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

		return -EFAULT;



	if (bacmp(&bdaddr, BDADDR_ANY) == 0)

		return -EBADF;



	if (hci_blacklist_lookup(hdev, &bdaddr))

		return -EEXIST;



	entry = kzalloc(sizeof(struct bdaddr_list), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	bacpy(&entry->bdaddr, &bdaddr);



	list_add(&entry->list, &hdev->blacklist);



	return 0;

}



int hci_blacklist_clear(struct hci_dev *hdev)

{

	struct list_head *p, *n;



	list_for_each_safe(p, n, &hdev->blacklist) {

		struct bdaddr_list *b;



		b = list_entry(p, struct bdaddr_list, list);



		list_del(p);

		kfree(b);

	return hci_blacklist_add(hdev, &bdaddr);

}



	return 0;

}



static int hci_blacklist_del(struct hci_dev *hdev, void __user *arg)

static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)

{

	bdaddr_t bdaddr;

	struct bdaddr_list *entry;



	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

		return -EFAULT;



	if (bacmp(&bdaddr, BDADDR_ANY) == 0)

		return hci_blacklist_clear(hdev);



	entry = hci_blacklist_lookup(hdev, &bdaddr);

	if (!entry)

		return -ENOENT;



	list_del(&entry->list);

	kfree(entry);



	return 0;

	return hci_blacklist_del(hdev, &bdaddr);

}



/* Ioctls that require bound socket */
@@ -290,12 +232,12 @@ static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsign 
	case HCIBLOCKADDR:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

		return hci_blacklist_add(hdev, (void __user *) arg);

		return hci_sock_blacklist_add(hdev, (void __user *) arg);



	case HCIUNBLOCKADDR:

		if (!capable(CAP_NET_ADMIN))

			return -EACCES;

		return hci_blacklist_del(hdev, (void __user *) arg);

		return hci_sock_blacklist_del(hdev, (void __user *) arg);



	default:

		if (hdev->ioctl)