Commit 738f6185 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add identity address check in param lookup functions 



Since we only store entries with identity addresses in the
le_conn_params and pend_le_conns lists we can avoid unnecessary lookups
by checking for an identity address before diving into the lists
themselves.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent bb5ce4d0

net/bluetooth/hci_core.c

+8 −0
Original line number Diff line number Diff line
@@ -3399,6 +3399,10 @@ struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev, 
{

	struct hci_conn_params *params;



	/* The conn params list only contains identity addresses */

	if (!hci_is_identity_address(addr, addr_type))

		return NULL;



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

		if (bacmp(&params->addr, addr) == 0 &&

		    params->addr_type == addr_type) {
@@ -3432,6 +3436,10 @@ struct hci_conn_params *hci_pend_le_conn_lookup(struct hci_dev *hdev, 
{

	struct hci_conn_params *param;



	/* The list only contains identity addresses */

	if (!hci_is_identity_address(addr, addr_type))

		return NULL;



	list_for_each_entry(param, &hdev->pend_le_conns, pend_le_conn) {

		if (bacmp(&param->addr, addr) == 0 &&

		    param->addr_type == addr_type)

net/bluetooth/hci_event.c

+0 −4
Original line number Diff line number Diff line
@@ -4246,10 +4246,6 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, 
		if (type == LE_ADV_DIRECT_IND)

			return;



		/* The conn params list only contains identity addresses */

		if (!hci_is_identity_address(bdaddr, bdaddr_type))

			return;



		param = hci_conn_params_lookup(hdev, bdaddr, bdaddr_type);

		if (!param || param->auto_connect != HCI_AUTO_CONN_REPORT)

			return;