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

Commit 96570ffc authored by Johan Hedberg's avatar Johan Hedberg Committed by John W. Linville
Browse files

Bluetooth: Fix mgmt handling of power on failures 



If hci_dev_open fails we need to ensure that the corresponding
mgmt_set_powered command gets an appropriate response. This patch fixes
the missing response by adding a new mgmt_set_powered_failed function
that's used to indicate a power on failure to mgmt. Since a situation
with the device being rfkilled may require special handling in user
space the patch uses a new dedicated mgmt status code for this.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cb3b3152

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event); 
int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);

int mgmt_index_added(struct hci_dev *hdev);

int mgmt_index_removed(struct hci_dev *hdev);

int mgmt_set_powered_failed(struct hci_dev *hdev, int err);

int mgmt_powered(struct hci_dev *hdev, u8 powered);

int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

int mgmt_connectable(struct hci_dev *hdev, u8 connectable);

include/net/bluetooth/mgmt.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define MGMT_STATUS_NOT_POWERED		0x0f

#define MGMT_STATUS_CANCELLED		0x10

#define MGMT_STATUS_INVALID_INDEX	0x11

#define MGMT_STATUS_RFKILLED		0x12



struct mgmt_hdr {

	__le16	opcode;

net/bluetooth/hci_core.c

+5 −1
Original line number Diff line number Diff line
@@ -1555,11 +1555,15 @@ static const struct rfkill_ops hci_rfkill_ops = { 
static void hci_power_on(struct work_struct *work)

{

	struct hci_dev *hdev = container_of(work, struct hci_dev, power_on);

	int err;



	BT_DBG("%s", hdev->name);



	if (hci_dev_open(hdev->id) < 0)

	err = hci_dev_open(hdev->id);

	if (err < 0) {

		mgmt_set_powered_failed(hdev, err);

		return;

	}



	if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))

		queue_delayed_work(hdev->req_workqueue, &hdev->power_off,

net/bluetooth/mgmt.c

+21 −0
Original line number Diff line number Diff line
@@ -3418,6 +3418,27 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) 
	return err;

}



int mgmt_set_powered_failed(struct hci_dev *hdev, int err)

{

	struct pending_cmd *cmd;

	u8 status;



	cmd = mgmt_pending_find(MGMT_OP_SET_POWERED, hdev);

	if (!cmd)

		return -ENOENT;



	if (err == -ERFKILL)

		status = MGMT_STATUS_RFKILLED;

	else

		status = MGMT_STATUS_FAILED;



	err = cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_POWERED, status);



	mgmt_pending_remove(cmd);



	return err;

}



int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)

{

	struct cmd_lookup match = { NULL, hdev };