summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2011-03-16 14:29:34 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-03-24 17:04:44 -0300
commit6994ca5e8ade57d18b7d1e05aad040c441a2ad37 (patch)
tree8a292dfc7e19c9ddeb605297aa3fcf89bca784f8
parent8763b4da41132e2d5a896cd5e629c3c0a652205e (diff)
downloadop-kernel-dev-6994ca5e8ade57d18b7d1e05aad040c441a2ad37.zip
op-kernel-dev-6994ca5e8ade57d18b7d1e05aad040c441a2ad37.tar.gz
Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply
The code was correctly calling _unlock at the end of the function but there was no actual _lock call anywhere. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0054c74..4476d8e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1230,6 +1230,8 @@ static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data,
if (!hdev)
return cmd_status(sk, index, mgmt_op, ENODEV);
+ hci_dev_lock_bh(hdev);
+
if (!test_bit(HCI_UP, &hdev->flags)) {
err = cmd_status(sk, index, mgmt_op, ENETDOWN);
goto failed;
OpenPOWER on IntegriCloud