Commit e1d08f40 authored Oct 01, 2013 by Johan Hedberg Committed by Marcel Holtmann Oct 01, 2013

Bluetooth: Fix workqueue synchronization in hci_dev_open



When hci_sock.c calls hci_dev_open it needs to ensure that there isn't
pending work in progress, such as that which is scheduled for the
initial setup procedure or the one for automatically powering off after
the setup procedure. This adds the necessary calls to ensure that any
previously scheduled work is completed before attempting to call
hci_dev_do_open.

This patch fixes a race with old user space versions where we might
receive a HCIDEVUP ioctl before the setup procedure has been completed.
When that happens the setup procedures callback may fail early and leave
the device in an inconsistent state, causing e.g. the setup callback to
be (incorrectly) called more than once.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent cbed0ca1

net/bluetooth/hci_core.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1273,6 +1273,16 @@ int hci_dev_open(__u16 dev)
		if (!hdev)
		return -ENODEV;

		/* We need to ensure that no other power on/off work is pending
		* before proceeding to call hci_dev_do_open. This is
		* particularly important if the setup procedure has not yet
		* completed.
		*/
		if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags))
		cancel_delayed_work(&hdev->power_off);

		flush_workqueue(hdev->req_workqueue);

		err = hci_dev_do_open(hdev);

		hci_dev_put(hdev);

Admin message