summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-03-01 07:55:35 +0400
committerGustavo F. Padovan <padovan@profusion.mobi>2012-03-01 08:28:04 +0400
commit1de028ceb54ccd28cc96f1530a195ae1b6a6d5b5 (patch)
tree17b1f270a183af3bd785dc1009c10f82a8212a43 /net/bluetooth
parent00abfe4442864144a77f70b6b411d691bcb796bf (diff)
downloadlinux-1de028ceb54ccd28cc96f1530a195ae1b6a6d5b5.tar.xz
Bluetooth: mgmt: Add missing hci_dev locking to set_le()
The set_le() function was missing hci_dev locking which is e.g. critical for the mgmt pending command adding/removing. Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 373b46a9eb17..abf1adb8bc16 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1273,10 +1273,12 @@ static int set_le(struct sock *sk, u16 index, void *data, u16 len)
return cmd_status(sk, index, MGMT_OP_SET_LE,
MGMT_STATUS_INVALID_PARAMS);
+ hci_dev_lock(hdev);
+
if (!enable_le || !(hdev->features[4] & LMP_LE)) {
err = cmd_status(sk, index, MGMT_OP_SET_LE,
MGMT_STATUS_NOT_SUPPORTED);
- goto failed;
+ goto unlock;
}
val = !!cp->val;
@@ -1292,23 +1294,23 @@ static int set_le(struct sock *sk, u16 index, void *data, u16 len)
err = send_settings_rsp(sk, MGMT_OP_SET_LE, hdev);
if (err < 0)
- goto failed;
+ goto unlock;
if (changed)
err = new_settings(hdev, sk);
- goto failed;
+ goto unlock;
}
if (mgmt_pending_find(MGMT_OP_SET_LE, hdev)) {
err = cmd_status(sk, index, MGMT_OP_SET_LE, MGMT_STATUS_BUSY);
- goto failed;
+ goto unlock;
}
cmd = mgmt_pending_add(sk, MGMT_OP_SET_LE, hdev, data, len);
if (!cmd) {
err = -ENOMEM;
- goto failed;
+ goto unlock;
}
memset(&hci_cp, 0, sizeof(hci_cp));
@@ -1322,10 +1324,11 @@ static int set_le(struct sock *sk, u16 index, void *data, u16 len)
sizeof(hci_cp), &hci_cp);
if (err < 0) {
mgmt_pending_remove(cmd);
- goto failed;
+ goto unlock;
}
-failed:
+unlock:
+ hci_dev_unlock(hdev);
hci_dev_put(hdev);
return err;
}