Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Johan Hedberg 2012-02-21 14:32:24 +02:00
parent 4b34ee7821
commit b5235a65ad
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/bluetooth/mgmt.c
View File

@ -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) {