Bluetooth: Fix failure to release lock in read_index_list()
authorJesper Juhl <jj@chaosbits.net>
Thu, 13 Jan 2011 23:18:49 +0000 (00:18 +0100)
committerGustavo F. Padovan <padovan@profusion.mobi>
Tue, 8 Feb 2011 03:40:04 +0000 (01:40 -0200)
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>
net/bluetooth/mgmt.c

index f827fd9083808f9126148cd8541fd29ad552b81b..ace872615c06c610a671a62a857e0d6ea760543f 100644 (file)
@@ -111,8 +111,10 @@ static int read_index_list(struct sock *sk)
 
        body_len = sizeof(*ev) + sizeof(*rp) + (2 * count);
        skb = alloc_skb(sizeof(*hdr) + body_len, GFP_ATOMIC);
-       if (!skb)
+       if (!skb) {
+               read_unlock(&hci_dev_list_lock);
                return -ENOMEM;
+       }
 
        hdr = (void *) skb_put(skb, sizeof(*hdr));
        hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);