Bluetooth: mgmt: Add missing hci_dev locking to set_le()
Johan Hedberg [Thu, 1 Mar 2012 03:55:35 +0000 (19:55 -0800)]
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>

net/bluetooth/mgmt.c

index 373b46a..abf1adb 100644 (file)
@@ -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;
 }