aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2011-01-13 18:18:49 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-07 22:40:04 -0500
commitb2c60d42db0fea1e6c4345739601024863566a13 (patch)
tree1d2faaded28811c36d13bf968f5ffe92e4fe3564 /net/bluetooth/mgmt.c
parent80f5585a292d087856cbc1ddc64d4f7477244b46 (diff)
Bluetooth: Fix failure to release lock in read_index_list()
If alloc_skb() fails in read_index_list() we'll return -ENOMEM without releasing 'hci_dev_list_lock'. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f827fd908380..ace872615c06 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -111,8 +111,10 @@ static int read_index_list(struct sock *sk)
111 111
112 body_len = sizeof(*ev) + sizeof(*rp) + (2 * count); 112 body_len = sizeof(*ev) + sizeof(*rp) + (2 * count);
113 skb = alloc_skb(sizeof(*hdr) + body_len, GFP_ATOMIC); 113 skb = alloc_skb(sizeof(*hdr) + body_len, GFP_ATOMIC);
114 if (!skb) 114 if (!skb) {
115 read_unlock(&hci_dev_list_lock);
115 return -ENOMEM; 116 return -ENOMEM;
117 }
116 118
117 hdr = (void *) skb_put(skb, sizeof(*hdr)); 119 hdr = (void *) skb_put(skb, sizeof(*hdr));
118 hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE); 120 hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);