raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Bluetooth: hci_core: Disable works on hci_unregister_dev

Browse Source 
[ Upstream commit 989fa5171f ]

This make use of disable_work_* on hci_unregister_dev since the hci_dev is
about to be freed new submissions are not disarable.

Fixes: 0d151a1037 ("Bluetooth: hci_core: cancel all works upon hci_unregister_dev()")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Luiz Augusto von Dentz
2024-10-22 11:09:13 -04:00
committed by Greg Kroah-Hartman
parent b27330128e
commit cfdb13a54e
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/bluetooth/hci_core.c
View File

@@ -1644,12 +1644,12 @@ void hci_adv_instances_clear(struct hci_dev *hdev)
struct adv_info *adv_instance, *n; struct adv_info *adv_instance, *n;
if (hdev->adv_instance_timeout) { if (hdev->adv_instance_timeout) {
cancel_delayed_work(&hdev->adv_instance_expire); disable_delayed_work(&hdev->adv_instance_expire);
hdev->adv_instance_timeout = 0; hdev->adv_instance_timeout = 0;
} }
list_for_each_entry_safe(adv_instance, n, &hdev->adv_instances, list) { list_for_each_entry_safe(adv_instance, n, &hdev->adv_instances, list) {
cancel_delayed_work_sync(&adv_instance->rpa_expired_cb); disable_delayed_work_sync(&adv_instance->rpa_expired_cb);
list_del(&adv_instance->list); list_del(&adv_instance->list);
kfree(adv_instance); kfree(adv_instance);
} }
@@ -2685,11 +2685,11 @@ void hci_unregister_dev(struct hci_dev *hdev)
list_del(&hdev->list); list_del(&hdev->list);
write_unlock(&hci_dev_list_lock); write_unlock(&hci_dev_list_lock);
cancel_work_sync(&hdev->rx_work); disable_work_sync(&hdev->rx_work);
cancel_work_sync(&hdev->cmd_work); disable_work_sync(&hdev->cmd_work);
cancel_work_sync(&hdev->tx_work); disable_work_sync(&hdev->tx_work);
cancel_work_sync(&hdev->power_on); disable_work_sync(&hdev->power_on);
cancel_work_sync(&hdev->error_reset); disable_work_sync(&hdev->error_reset);
hci_cmd_sync_clear(hdev); hci_cmd_sync_clear(hdev);
@@ -2796,8 +2796,14 @@ static void hci_cancel_cmd_sync(struct hci_dev *hdev, int err)
{ {
bt_dev_dbg(hdev, "err 0x%2.2x", err); bt_dev_dbg(hdev, "err 0x%2.2x", err);
if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {
disable_delayed_work_sync(&hdev->cmd_timer);
disable_delayed_work_sync(&hdev->ncmd_timer);
} else {
cancel_delayed_work_sync(&hdev->cmd_timer); cancel_delayed_work_sync(&hdev->cmd_timer);
cancel_delayed_work_sync(&hdev->ncmd_timer); cancel_delayed_work_sync(&hdev->ncmd_timer);
}
atomic_set(&hdev->cmd_cnt, 1); atomic_set(&hdev->cmd_cnt, 1);
hci_cmd_sync_cancel_sync(hdev, err); hci_cmd_sync_cancel_sync(hdev, err);

6
net/bluetooth/hci_sync.c
View File

@@ -5131,9 +5131,15 @@ int hci_dev_close_sync(struct hci_dev *hdev)
bt_dev_dbg(hdev, ""); bt_dev_dbg(hdev, "");
if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {
disable_delayed_work(&hdev->power_off);
disable_delayed_work(&hdev->ncmd_timer);
disable_delayed_work(&hdev->le_scan_disable);
} else {
cancel_delayed_work(&hdev->power_off); cancel_delayed_work(&hdev->power_off);
cancel_delayed_work(&hdev->ncmd_timer); cancel_delayed_work(&hdev->ncmd_timer);
cancel_delayed_work(&hdev->le_scan_disable); cancel_delayed_work(&hdev->le_scan_disable);
}
hci_cmd_sync_cancel_sync(hdev, ENODEV); hci_cmd_sync_cancel_sync(hdev, ENODEV);