Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f9309f authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix cancel_delayed_work_sync usage with locks 



The cancel_delayed_work_sync function should not be used if we hold any
locks. Luckily all places where this is the case it is also safe to use
the non-sync version.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 56e5cb86

net/bluetooth/hci_core.c

+3 −3
Original line number Diff line number Diff line
@@ -599,12 +599,12 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	tasklet_kill(&hdev->tx_task);



	if (hdev->discov_timeout > 0) {

		cancel_delayed_work_sync(&hdev->discov_off);

		cancel_delayed_work(&hdev->discov_off);

		hdev->discov_timeout = 0;

	}



	if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))

		cancel_delayed_work_sync(&hdev->power_off);

		cancel_delayed_work(&hdev->power_off);



	hci_dev_lock_bh(hdev);

	inquiry_cache_flush(hdev);
@@ -828,7 +828,7 @@ int hci_get_dev_list(void __user *arg) 
	read_lock_bh(&hci_dev_list_lock);

	list_for_each_entry(hdev, &hci_dev_list, list) {

		if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))

			cancel_delayed_work_sync(&hdev->power_off);

			cancel_delayed_work(&hdev->power_off);



		if (!test_bit(HCI_MGMT, &hdev->flags))

			set_bit(HCI_PAIRABLE, &hdev->flags);

net/bluetooth/mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int read_index_list(struct sock *sk) 
	i = 0;

	list_for_each_entry(d, &hci_dev_list, list) {

		if (test_and_clear_bit(HCI_AUTO_OFF, &d->flags))

			cancel_delayed_work_sync(&d->power_off);

			cancel_delayed_work(&d->power_off);



		if (test_bit(HCI_SETUP, &d->flags))

			continue;
@@ -398,7 +398,7 @@ static int set_discoverable(struct sock *sk, u16 index, unsigned char *data, 
	if (cp->val)

		scan |= SCAN_INQUIRY;

	else

		cancel_delayed_work_sync(&hdev->discov_off);

		cancel_delayed_work(&hdev->discov_off);



	err = hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, 1, &scan);

	if (err < 0)