Bluetooth: Fix busy return for mgmt_set_powered in some cases (87b95ba6) · Commits · 戴 / test

We should return a "busy" error always when there is another mgmt_set_powered operation in progress. Previously when powering on while the auto off timer was still set the code could have let two or more pending power on commands to be queued. This patch fixes the issue by moving the check for duplicate commands to an earlier point in the set_powered handler. Signed-off-by:

Johan Hedberg <johan.hedberg@intel.com> Acked-by:

Marcel Holtmann <marcel@holtmann.org> Signed-off-by:

Gustavo Padovan <gustavo.padovan@collabora.co.uk>

net/bluetooth/mgmt.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -807,6 +807,12 @@ static int set_powered(struct sock sk, struct hci_dev hdev, void *data,

		hci_dev_lock(hdev);

		if (mgmt_pending_find(MGMT_OP_SET_POWERED, hdev)) {
		err = cmd_status(sk, hdev->id, MGMT_OP_SET_POWERED,
		MGMT_STATUS_BUSY);
		goto failed;
		}

		if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags)) {
		cancel_delayed_work(&hdev->power_off);

		@@ -823,12 +829,6 @@ static int set_powered(struct sock sk, struct hci_dev hdev, void *data,
		goto failed;
		}

		if (mgmt_pending_find(MGMT_OP_SET_POWERED, hdev)) {
		err = cmd_status(sk, hdev->id, MGMT_OP_SET_POWERED,
		MGMT_STATUS_BUSY);
		goto failed;
		}

		cmd = mgmt_pending_add(sk, MGMT_OP_SET_POWERED, hdev, data, len);
		if (!cmd) {
		err = -ENOMEM;

Admin message