Commit 5e2b6064 authored by Niels Dossche's avatar Niels Dossche Committed by Marcel Holtmann
Browse files

Bluetooth: protect le accept and resolv lists with hdev->lock 



Concurrent operations from events on le_{accept,resolv}_list are
currently unprotected by hdev->lock.
Most existing code do already protect the lists with that lock.
This can be observed in hci_debugfs and hci_sync.
Add the protection for these events too.

Fixes: b950aa88 ("Bluetooth: Add definitions and track LE resolve list modification")
Fixes: 0f36b589 ("Bluetooth: Track LE white list modification via HCI commands")
Signed-off-by: default avatarNiels Dossche <dossche.niels@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent fb048cae

net/bluetooth/hci_event.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -1835,7 +1835,9 @@ static u8 hci_cc_le_clear_accept_list(struct hci_dev *hdev, void *data, 
	if (rp->status)

	if (rp->status)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

	hci_bdaddr_list_clear(&hdev->le_accept_list);

	hci_bdaddr_list_clear(&hdev->le_accept_list);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}
@@ -1855,8 +1857,10 @@ static u8 hci_cc_le_add_to_accept_list(struct hci_dev *hdev, void *data, 
	if (!sent)

	if (!sent)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

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

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

			    sent->bdaddr_type);

			    sent->bdaddr_type);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}
@@ -1876,8 +1880,10 @@ static u8 hci_cc_le_del_from_accept_list(struct hci_dev *hdev, void *data, 
	if (!sent)

	if (!sent)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

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

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

			    sent->bdaddr_type);

			    sent->bdaddr_type);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}
@@ -1949,9 +1955,11 @@ static u8 hci_cc_le_add_to_resolv_list(struct hci_dev *hdev, void *data, 
	if (!sent)

	if (!sent)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

	hci_bdaddr_list_add_with_irk(&hdev->le_resolv_list, &sent->bdaddr,

	hci_bdaddr_list_add_with_irk(&hdev->le_resolv_list, &sent->bdaddr,

				sent->bdaddr_type, sent->peer_irk,

				sent->bdaddr_type, sent->peer_irk,

				sent->local_irk);

				sent->local_irk);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}
@@ -1971,8 +1979,10 @@ static u8 hci_cc_le_del_from_resolv_list(struct hci_dev *hdev, void *data, 
	if (!sent)

	if (!sent)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

	hci_bdaddr_list_del_with_irk(&hdev->le_resolv_list, &sent->bdaddr,

	hci_bdaddr_list_del_with_irk(&hdev->le_resolv_list, &sent->bdaddr,

			    sent->bdaddr_type);

			    sent->bdaddr_type);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}
@@ -1987,7 +1997,9 @@ static u8 hci_cc_le_clear_resolv_list(struct hci_dev *hdev, void *data, 
	if (rp->status)

	if (rp->status)

		return rp->status;

		return rp->status;





	hci_dev_lock(hdev);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

	hci_dev_unlock(hdev);





	return rp->status;

	return rp->status;

}

}