Commit 3d4f9c00 authored by Archie Pusaka's avatar Archie Pusaka Committed by Marcel Holtmann
Browse files

Bluetooth: use inclusive language when filtering devices 

This patch replaces some non-inclusive terms based on the appropriate
language mapping table compiled by the Bluetooth SIG:
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf



Specifically, these terms are replaced:
blacklist -> reject list
whitelist -> accept list

Signed-off-by: default avatarArchie Pusaka <apusaka@chromium.org>
Reviewed-by: default avatarMiao-chen Chou <mcchou@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 39bc74ca

include/net/bluetooth/hci.h

+8 −8
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ struct hci_cp_le_set_scan_enable { 
} __packed;



#define HCI_LE_USE_PEER_ADDR		0x00

#define HCI_LE_USE_WHITELIST		0x01

#define HCI_LE_USE_ACCEPT_LIST		0x01



#define HCI_OP_LE_CREATE_CONN		0x200d

struct hci_cp_le_create_conn {
@@ -1525,22 +1525,22 @@ struct hci_cp_le_create_conn { 


#define HCI_OP_LE_CREATE_CONN_CANCEL	0x200e



#define HCI_OP_LE_READ_WHITE_LIST_SIZE	0x200f

struct hci_rp_le_read_white_list_size {

#define HCI_OP_LE_READ_ACCEPT_LIST_SIZE	0x200f

struct hci_rp_le_read_accept_list_size {

	__u8	status;

	__u8	size;

} __packed;



#define HCI_OP_LE_CLEAR_WHITE_LIST	0x2010

#define HCI_OP_LE_CLEAR_ACCEPT_LIST	0x2010



#define HCI_OP_LE_ADD_TO_WHITE_LIST	0x2011

struct hci_cp_le_add_to_white_list {

#define HCI_OP_LE_ADD_TO_ACCEPT_LIST	0x2011

struct hci_cp_le_add_to_accept_list {

	__u8     bdaddr_type;

	bdaddr_t bdaddr;

} __packed;



#define HCI_OP_LE_DEL_FROM_WHITE_LIST	0x2012

struct hci_cp_le_del_from_white_list {

#define HCI_OP_LE_DEL_FROM_ACCEPT_LIST	0x2012

struct hci_cp_le_del_from_accept_list {

	__u8     bdaddr_type;

	bdaddr_t bdaddr;

} __packed;

include/net/bluetooth/hci_core.h

+4 −4
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ struct hci_dev { 
	__u8		max_page;

	__u8		features[HCI_MAX_PAGES][8];

	__u8		le_features[8];

	__u8		le_white_list_size;

	__u8		le_accept_list_size;

	__u8		le_resolv_list_size;

	__u8		le_num_of_adv_sets;

	__u8		le_states[8];
@@ -522,14 +522,14 @@ struct hci_dev { 
	struct hci_conn_hash	conn_hash;



	struct list_head	mgmt_pending;

	struct list_head	blacklist;

	struct list_head	whitelist;

	struct list_head	reject_list;

	struct list_head	accept_list;

	struct list_head	uuids;

	struct list_head	link_keys;

	struct list_head	long_term_keys;

	struct list_head	identity_resolving_keys;

	struct list_head	remote_oob_data;

	struct list_head	le_white_list;

	struct list_head	le_accept_list;

	struct list_head	le_resolv_list;

	struct list_head	le_conn_params;

	struct list_head	pend_le_conns;

net/bluetooth/hci_core.c

+12 −12
Original line number Diff line number Diff line
@@ -749,14 +749,14 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt) 
		}



		if (hdev->commands[26] & 0x40) {

			/* Read LE White List Size */

			hci_req_add(req, HCI_OP_LE_READ_WHITE_LIST_SIZE,

			/* Read LE Accept List Size */

			hci_req_add(req, HCI_OP_LE_READ_ACCEPT_LIST_SIZE,

				    0, NULL);

		}



		if (hdev->commands[26] & 0x80) {

			/* Clear LE White List */

			hci_req_add(req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);

			/* Clear LE Accept List */

			hci_req_add(req, HCI_OP_LE_CLEAR_ACCEPT_LIST, 0, NULL);

		}



		if (hdev->commands[34] & 0x40) {
@@ -3713,13 +3713,13 @@ static int hci_suspend_notifier(struct notifier_block *nb, unsigned long action, 
		/* Suspend consists of two actions:

		 *  - First, disconnect everything and make the controller not

		 *    connectable (disabling scanning)

		 *  - Second, program event filter/whitelist and enable scan

		 *  - Second, program event filter/accept list and enable scan

		 */

		ret = hci_change_suspend_state(hdev, BT_SUSPEND_DISCONNECT);

		if (!ret)

			state = BT_SUSPEND_DISCONNECT;



		/* Only configure whitelist if disconnect succeeded and wake

		/* Only configure accept list if disconnect succeeded and wake

		 * isn't being prevented.

		 */

		if (!ret && !(hdev->prevent_wake && hdev->prevent_wake(hdev))) {
@@ -3827,14 +3827,14 @@ struct hci_dev *hci_alloc_dev(void) 
	mutex_init(&hdev->req_lock);



	INIT_LIST_HEAD(&hdev->mgmt_pending);

	INIT_LIST_HEAD(&hdev->blacklist);

	INIT_LIST_HEAD(&hdev->whitelist);

	INIT_LIST_HEAD(&hdev->reject_list);

	INIT_LIST_HEAD(&hdev->accept_list);

	INIT_LIST_HEAD(&hdev->uuids);

	INIT_LIST_HEAD(&hdev->link_keys);

	INIT_LIST_HEAD(&hdev->long_term_keys);

	INIT_LIST_HEAD(&hdev->identity_resolving_keys);

	INIT_LIST_HEAD(&hdev->remote_oob_data);

	INIT_LIST_HEAD(&hdev->le_white_list);

	INIT_LIST_HEAD(&hdev->le_accept_list);

	INIT_LIST_HEAD(&hdev->le_resolv_list);

	INIT_LIST_HEAD(&hdev->le_conn_params);

	INIT_LIST_HEAD(&hdev->pend_le_conns);
@@ -4047,8 +4047,8 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	destroy_workqueue(hdev->req_workqueue);



	hci_dev_lock(hdev);

	hci_bdaddr_list_clear(&hdev->blacklist);

	hci_bdaddr_list_clear(&hdev->whitelist);

	hci_bdaddr_list_clear(&hdev->reject_list);

	hci_bdaddr_list_clear(&hdev->accept_list);

	hci_uuids_clear(hdev);

	hci_link_keys_clear(hdev);

	hci_smp_ltks_clear(hdev);
@@ -4056,7 +4056,7 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	hci_remote_oob_data_clear(hdev);

	hci_adv_instances_clear(hdev);

	hci_adv_monitors_clear(hdev);

	hci_bdaddr_list_clear(&hdev->le_white_list);

	hci_bdaddr_list_clear(&hdev->le_accept_list);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

	hci_conn_params_clear_all(hdev);

	hci_discovery_filter_clear(hdev);

net/bluetooth/hci_debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int device_list_show(struct seq_file *f, void *ptr) 
	struct bdaddr_list *b;



	hci_dev_lock(hdev);

	list_for_each_entry(b, &hdev->whitelist, list)

	list_for_each_entry(b, &hdev->accept_list, list)

		seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);

	list_for_each_entry(p, &hdev->le_conn_params, list) {

		seq_printf(f, "%pMR (type %u) %u\n", &p->addr, p->addr_type,
@@ -144,7 +144,7 @@ static int blacklist_show(struct seq_file *f, void *p) 
	struct bdaddr_list *b;



	hci_dev_lock(hdev);

	list_for_each_entry(b, &hdev->blacklist, list)

	list_for_each_entry(b, &hdev->reject_list, list)

		seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);

	hci_dev_unlock(hdev);
@@ -784,7 +784,7 @@ static int white_list_show(struct seq_file *f, void *ptr) 
	struct bdaddr_list *b;



	hci_dev_lock(hdev);

	list_for_each_entry(b, &hdev->le_white_list, list)

	list_for_each_entry(b, &hdev->le_accept_list, list)

		seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);

	hci_dev_unlock(hdev);
@@ -1195,7 +1195,7 @@ void hci_debugfs_create_le(struct hci_dev *hdev) 
				    &force_static_address_fops);



	debugfs_create_u8("white_list_size", 0444, hdev->debugfs,

			  &hdev->le_white_list_size);

			  &hdev->le_accept_list_size);

	debugfs_create_file("white_list", 0444, hdev->debugfs, hdev,

			    &white_list_fops);

	debugfs_create_u8("resolv_list_size", 0444, hdev->debugfs,

net/bluetooth/hci_event.c

+35 −35
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 


	hdev->ssp_debug_mode = 0;



	hci_bdaddr_list_clear(&hdev->le_white_list);

	hci_bdaddr_list_clear(&hdev->le_accept_list);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

}
@@ -1492,20 +1492,20 @@ static void hci_cc_le_read_num_adv_sets(struct hci_dev *hdev, 
	hdev->le_num_of_adv_sets = rp->num_of_sets;

}



static void hci_cc_le_read_white_list_size(struct hci_dev *hdev,

static void hci_cc_le_read_accept_list_size(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	struct hci_rp_le_read_white_list_size *rp = (void *) skb->data;

	struct hci_rp_le_read_accept_list_size *rp = (void *)skb->data;



	BT_DBG("%s status 0x%2.2x size %u", hdev->name, rp->status, rp->size);



	if (rp->status)

		return;



	hdev->le_white_list_size = rp->size;

	hdev->le_accept_list_size = rp->size;

}



static void hci_cc_le_clear_white_list(struct hci_dev *hdev,

static void hci_cc_le_clear_accept_list(struct hci_dev *hdev,

					struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);
@@ -1515,13 +1515,13 @@ static void hci_cc_le_clear_white_list(struct hci_dev *hdev, 
	if (status)

		return;



	hci_bdaddr_list_clear(&hdev->le_white_list);

	hci_bdaddr_list_clear(&hdev->le_accept_list);

}



static void hci_cc_le_add_to_white_list(struct hci_dev *hdev,

static void hci_cc_le_add_to_accept_list(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_cp_le_add_to_white_list *sent;

	struct hci_cp_le_add_to_accept_list *sent;

	__u8 status = *((__u8 *) skb->data);



	BT_DBG("%s status 0x%2.2x", hdev->name, status);
@@ -1529,18 +1529,18 @@ static void hci_cc_le_add_to_white_list(struct hci_dev *hdev, 
	if (status)

		return;



	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_WHITE_LIST);

	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_ADD_TO_ACCEPT_LIST);

	if (!sent)

		return;



	hci_bdaddr_list_add(&hdev->le_white_list, &sent->bdaddr,

	hci_bdaddr_list_add(&hdev->le_accept_list, &sent->bdaddr,

			    sent->bdaddr_type);

}



static void hci_cc_le_del_from_white_list(struct hci_dev *hdev,

static void hci_cc_le_del_from_accept_list(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_cp_le_del_from_white_list *sent;

	struct hci_cp_le_del_from_accept_list *sent;

	__u8 status = *((__u8 *) skb->data);



	BT_DBG("%s status 0x%2.2x", hdev->name, status);
@@ -1548,11 +1548,11 @@ static void hci_cc_le_del_from_white_list(struct hci_dev *hdev, 
	if (status)

		return;



	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_WHITE_LIST);

	sent = hci_sent_cmd_data(hdev, HCI_OP_LE_DEL_FROM_ACCEPT_LIST);

	if (!sent)

		return;



	hci_bdaddr_list_del(&hdev->le_white_list, &sent->bdaddr,

	hci_bdaddr_list_del(&hdev->le_accept_list, &sent->bdaddr,

			    sent->bdaddr_type);

}
@@ -2367,7 +2367,7 @@ static void cs_le_create_conn(struct hci_dev *hdev, bdaddr_t *peer_addr, 
	/* We don't want the connection attempt to stick around

	 * indefinitely since LE doesn't have a page timeout concept

	 * like BR/EDR. Set a timer for any connection that doesn't use

	 * the white list for connecting.

	 * the accept list for connecting.

	 */

	if (filter_policy == HCI_LE_USE_PEER_ADDR)

		queue_delayed_work(conn->hdev->workqueue,
@@ -2623,7 +2623,7 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		 * only used during suspend.

		 */

		if (ev->link_type == ACL_LINK &&

		    hci_bdaddr_list_lookup_with_flags(&hdev->whitelist,

		    hci_bdaddr_list_lookup_with_flags(&hdev->accept_list,

						      &ev->bdaddr,

						      BDADDR_BREDR)) {

			conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
@@ -2745,19 +2745,19 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		return;

	}



	if (hci_bdaddr_list_lookup(&hdev->blacklist, &ev->bdaddr,

	if (hci_bdaddr_list_lookup(&hdev->reject_list, &ev->bdaddr,

				   BDADDR_BREDR)) {

		hci_reject_conn(hdev, &ev->bdaddr);

		return;

	}



	/* Require HCI_CONNECTABLE or a whitelist entry to accept the

	/* Require HCI_CONNECTABLE or an accept list entry to accept the

	 * connection. These features are only touched through mgmt so

	 * only do the checks if HCI_MGMT is set.

	 */

	if (hci_dev_test_flag(hdev, HCI_MGMT) &&

	    !hci_dev_test_flag(hdev, HCI_CONNECTABLE) &&

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

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

					       BDADDR_BREDR)) {

		hci_reject_conn(hdev, &ev->bdaddr);

		return;
@@ -3538,20 +3538,20 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, 
		hci_cc_le_set_scan_enable(hdev, skb);

		break;



	case HCI_OP_LE_READ_WHITE_LIST_SIZE:

		hci_cc_le_read_white_list_size(hdev, skb);

	case HCI_OP_LE_READ_ACCEPT_LIST_SIZE:

		hci_cc_le_read_accept_list_size(hdev, skb);

		break;



	case HCI_OP_LE_CLEAR_WHITE_LIST:

		hci_cc_le_clear_white_list(hdev, skb);

	case HCI_OP_LE_CLEAR_ACCEPT_LIST:

		hci_cc_le_clear_accept_list(hdev, skb);

		break;



	case HCI_OP_LE_ADD_TO_WHITE_LIST:

		hci_cc_le_add_to_white_list(hdev, skb);

	case HCI_OP_LE_ADD_TO_ACCEPT_LIST:

		hci_cc_le_add_to_accept_list(hdev, skb);

		break;



	case HCI_OP_LE_DEL_FROM_WHITE_LIST:

		hci_cc_le_del_from_white_list(hdev, skb);

	case HCI_OP_LE_DEL_FROM_ACCEPT_LIST:

		hci_cc_le_del_from_accept_list(hdev, skb);

		break;



	case HCI_OP_LE_READ_SUPPORTED_STATES:
@@ -5132,7 +5132,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, 


		/* If we didn't have a hci_conn object previously

		 * but we're in central role this must be something

		 * initiated using a white list. Since white list based

		 * initiated using an accept list. Since accept list based

		 * connections are not "first class citizens" we don't

		 * have full tracking of them. Therefore, we go ahead

		 * with a "best effort" approach of determining the
@@ -5224,7 +5224,7 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, 
		addr_type = BDADDR_LE_RANDOM;



	/* Drop the connection if the device is blocked */

	if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {

	if (hci_bdaddr_list_lookup(&hdev->reject_list, &conn->dst, addr_type)) {

		hci_conn_drop(conn);

		goto unlock;

	}
@@ -5380,7 +5380,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev, 
		return NULL;



	/* Ignore if the device is blocked */

	if (hci_bdaddr_list_lookup(&hdev->blacklist, addr, addr_type))

	if (hci_bdaddr_list_lookup(&hdev->reject_list, addr, addr_type))

		return NULL;



	/* Most controller will fail if we try to create new connections