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

Commit b5235a65 authored by Johan Hedberg's avatar Johan Hedberg
Browse files

Bluetooth: mgmt: Fix set_local_name and set_dev_class powered checks 



Both the Set Local Name and the Set Device Class commands should fail if
the adapter is not powered on.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4b34ee78

net/bluetooth/mgmt.c

+13 −0
Original line number Diff line number Diff line
@@ -1272,6 +1272,12 @@ static int set_dev_class(struct sock *sk, u16 index, void *data, u16 len) 


	hci_dev_lock(hdev);



	if (!hdev_is_powered(hdev)) {

		err = cmd_status(sk, index, MGMT_OP_SET_DEV_CLASS,

						MGMT_STATUS_NOT_POWERED);

		goto unlock;

	}



	hdev->major_class = cp->major;

	hdev->minor_class = cp->minor;
@@ -1288,6 +1294,7 @@ static int set_dev_class(struct sock *sk, u16 index, void *data, u16 len) 
		err = cmd_complete(sk, index, MGMT_OP_SET_DEV_CLASS, 0,

								NULL, 0);



unlock:

	hci_dev_unlock(hdev);

	hci_dev_put(hdev);
@@ -2076,6 +2083,12 @@ static int set_local_name(struct sock *sk, u16 index, void *data, 


	hci_dev_lock(hdev);



	if (!hdev_is_powered(hdev)) {

		err = cmd_status(sk, index, MGMT_OP_SET_LOCAL_NAME,

						MGMT_STATUS_NOT_POWERED);

		goto failed;

	}



	cmd = mgmt_pending_add(sk, MGMT_OP_SET_LOCAL_NAME, hdev, data,

									len);

	if (!cmd) {