Commit 8baaa403 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Johan Hedberg
Browse files

Bluetooth: Add bdaddr_list_with_flags for classic whitelist 



In order to more easily add device flags to classic devices, create
a new type of bdaddr_list that supports setting flags.

Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: default avatarAlain Michaud <alainm@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent aececa64

include/net/bluetooth/hci_core.h

+16 −2
Original line number Diff line number Diff line
@@ -136,6 +136,13 @@ struct bdaddr_list_with_irk { 
	u8 local_irk[16];

};



struct bdaddr_list_with_flags {

	struct list_head list;

	bdaddr_t bdaddr;

	u8 bdaddr_type;

	u32 current_flags;

};



struct bt_uuid {

	struct list_head list;

	u8 uuid[16];
@@ -1169,12 +1176,19 @@ struct bdaddr_list *hci_bdaddr_list_lookup(struct list_head *list, 
struct bdaddr_list_with_irk *hci_bdaddr_list_lookup_with_irk(

				    struct list_head *list, bdaddr_t *bdaddr,

				    u8 type);

struct bdaddr_list_with_flags *

hci_bdaddr_list_lookup_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				  u8 type);

int hci_bdaddr_list_add(struct list_head *list, bdaddr_t *bdaddr, u8 type);

int hci_bdaddr_list_add_with_irk(struct list_head *list, bdaddr_t *bdaddr,

				 u8 type, u8 *peer_irk, u8 *local_irk);

int hci_bdaddr_list_add_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type, u32 flags);

int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type);

int hci_bdaddr_list_del_with_irk(struct list_head *list, bdaddr_t *bdaddr,

				 u8 type);

int hci_bdaddr_list_del_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type);

void hci_bdaddr_list_clear(struct list_head *list);



struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

net/bluetooth/hci_core.c

+58 −0
Original line number Diff line number Diff line
@@ -3023,6 +3023,20 @@ struct bdaddr_list_with_irk *hci_bdaddr_list_lookup_with_irk( 
	return NULL;

}



struct bdaddr_list_with_flags *

hci_bdaddr_list_lookup_with_flags(struct list_head *bdaddr_list,

				  bdaddr_t *bdaddr, u8 type)

{

	struct bdaddr_list_with_flags *b;



	list_for_each_entry(b, bdaddr_list, list) {

		if (!bacmp(&b->bdaddr, bdaddr) && b->bdaddr_type == type)

			return b;

	}



	return NULL;

}



void hci_bdaddr_list_clear(struct list_head *bdaddr_list)

{

	struct bdaddr_list *b, *n;
@@ -3084,6 +3098,30 @@ int hci_bdaddr_list_add_with_irk(struct list_head *list, bdaddr_t *bdaddr, 
	return 0;

}



int hci_bdaddr_list_add_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type, u32 flags)

{

	struct bdaddr_list_with_flags *entry;



	if (!bacmp(bdaddr, BDADDR_ANY))

		return -EBADF;



	if (hci_bdaddr_list_lookup(list, bdaddr, type))

		return -EEXIST;



	entry = kzalloc(sizeof(*entry), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	bacpy(&entry->bdaddr, bdaddr);

	entry->bdaddr_type = type;

	entry->current_flags = flags;



	list_add(&entry->list, list);



	return 0;

}



int hci_bdaddr_list_del(struct list_head *list, bdaddr_t *bdaddr, u8 type)

{

	struct bdaddr_list *entry;
@@ -3123,6 +3161,26 @@ int hci_bdaddr_list_del_with_irk(struct list_head *list, bdaddr_t *bdaddr, 
	return 0;

}



int hci_bdaddr_list_del_with_flags(struct list_head *list, bdaddr_t *bdaddr,

				   u8 type)

{

	struct bdaddr_list_with_flags *entry;



	if (!bacmp(bdaddr, BDADDR_ANY)) {

		hci_bdaddr_list_clear(list);

		return 0;

	}



	entry = hci_bdaddr_list_lookup_with_flags(list, bdaddr, type);

	if (!entry)

		return -ENOENT;



	list_del(&entry->list);

	kfree(entry);



	return 0;

}



/* This function requires the caller holds hdev->lock */

struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,

					       bdaddr_t *addr, u8 addr_type)

net/bluetooth/hci_event.c

+4 −4
Original line number Diff line number Diff line
@@ -2697,7 +2697,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	 */

	if (hci_dev_test_flag(hdev, HCI_MGMT) &&

	    !hci_dev_test_flag(hdev, HCI_CONNECTABLE) &&

	    !hci_bdaddr_list_lookup(&hdev->whitelist, &ev->bdaddr,

	    !hci_bdaddr_list_lookup_with_flags(&hdev->whitelist, &ev->bdaddr,

					       BDADDR_BREDR)) {

		hci_reject_conn(hdev, &ev->bdaddr);

		return;

net/bluetooth/mgmt.c

+3 −2
Original line number Diff line number Diff line
@@ -6000,8 +6000,9 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, 
			goto unlock;

		}



		err = hci_bdaddr_list_add(&hdev->whitelist, &cp->addr.bdaddr,

					  cp->addr.type);

		err = hci_bdaddr_list_add_with_flags(&hdev->whitelist,

						     &cp->addr.bdaddr,

						     cp->addr.type, 0);

		if (err)

			goto unlock;