leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Move memory location outside of hci_dev lock

Browse Source 
Taking the hci_dev lock for just a memory allocation seems a bit too
much and not really needed. So instead try to allocate the memory first
and then take the lock.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2015-03-28 15:18:58 -07:00 committed by Johan Hedberg
parent 880897d4c9
commit efcd8c98e0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/bluetooth/mgmt.c
View File

@ -6446,14 +6446,12 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev,
&cp->type, sizeof(cp->type)); &cp->type, sizeof(cp->type));
} }
hci_dev_lock(hdev);
rp_len = sizeof(*rp) + eir_len; rp_len = sizeof(*rp) + eir_len;
rp = kmalloc(rp_len, GFP_ATOMIC); rp = kmalloc(rp_len, GFP_ATOMIC);
if (!rp) { if (!rp)
hci_dev_unlock(hdev);
return -ENOMEM; return -ENOMEM;
}
hci_dev_lock(hdev);
eir_len = 0; eir_len = 0;
switch (cp->type) { switch (cp->type) {
@ -6517,13 +6515,13 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev,
break; break;
} }
rp->type = cp->type;
rp->eir_len = cpu_to_le16(eir_len);
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
hci_sock_set_flag(sk, HCI_MGMT_OOB_DATA_EVENTS); hci_sock_set_flag(sk, HCI_MGMT_OOB_DATA_EVENTS);
rp->type = cp->type;
rp->eir_len = cpu_to_le16(eir_len);
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_EXT_DATA, err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_EXT_DATA,
MGMT_STATUS_SUCCESS, rp, sizeof(*rp) + eir_len); MGMT_STATUS_SUCCESS, rp, sizeof(*rp) + eir_len);
if (err < 0) if (err < 0)