Commit 0eee35bd authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Update resolving list when updating whitelist 



When the whitelist is updated, then also update the entries of the
resolving list for devices where IRKs are available.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarSathish Narsimman <sathish.narasimman@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e1d57235

net/bluetooth/hci_request.c

+39 −2
Original line number Diff line number Diff line
@@ -694,6 +694,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr, 
	bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from whitelist", &cp.bdaddr,

		   cp.bdaddr_type);

	hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);



	if (use_ll_privacy(req->hdev)) {

		struct smp_irk *irk;



		irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type);

		if (irk) {

			struct hci_cp_le_del_from_resolv_list cp;



			cp.bdaddr_type = bdaddr_type;

			bacpy(&cp.bdaddr, bdaddr);



			hci_req_add(req, HCI_OP_LE_DEL_FROM_RESOLV_LIST,

				    sizeof(cp), &cp);

		}

	}

}



/* Adds connection to white list if needed. On error, returns -1. */
@@ -714,7 +729,7 @@ static int add_to_white_list(struct hci_request *req, 
		return -1;



	/* White list can not be used with RPAs */

	if (!allow_rpa &&

	if (!allow_rpa && !use_ll_privacy(hdev) &&

	    hci_find_irk_by_addr(hdev, &params->addr, params->addr_type)) {

		return -1;

	}
@@ -732,6 +747,28 @@ static int add_to_white_list(struct hci_request *req, 
		   cp.bdaddr_type);

	hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);



	if (use_ll_privacy(hdev)) {

		struct smp_irk *irk;



		irk = hci_find_irk_by_addr(hdev, &params->addr,

					   params->addr_type);

		if (irk) {

			struct hci_cp_le_add_to_resolv_list cp;



			cp.bdaddr_type = params->addr_type;

			bacpy(&cp.bdaddr, &params->addr);

			memcpy(cp.peer_irk, irk->val, 16);



			if (hci_dev_test_flag(hdev, HCI_PRIVACY))

				memcpy(cp.local_irk, hdev->irk, 16);

			else

				memset(cp.local_irk, 0, 16);



			hci_req_add(req, HCI_OP_LE_ADD_TO_RESOLV_LIST,

				    sizeof(cp), &cp);

		}

	}



	return 0;

}
@@ -772,7 +809,7 @@ static u8 update_white_list(struct hci_request *req) 
		}



		/* White list can not be used with RPAs */

		if (!allow_rpa &&

		if (!allow_rpa && !use_ll_privacy(hdev) &&

		    hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {

			return 0x00;

		}