[PATCH] net: bluetooth: fix locking problem

Subsystems: bluetooth subsystem, the rest

STALE5752d

2 messages, 2 authors, 2011-01-17 · open the first message on its own page

[PATCH] net: bluetooth: fix locking problem

From: Vasiliy Kulikov <hidden>
Date: 2011-01-17 10:08:48

If alloc_skb() failed we still hold hci_dev_list_lock.  The code should
unlock it before exit.

Signed-off-by: Vasiliy Kulikov <redacted>
---
 Compile tested only.

 net/bluetooth/mgmt.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f827fd9..ace8726 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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);
-- 
1.7.0.4

Re: [PATCH] net: bluetooth: fix locking problem

From: Andrei Emeltchenko <hidden>
Date: 2011-01-17 10:28:32

On Mon, Jan 17, 2011 at 12:08 PM, Vasiliy Kulikov [off-list ref] wrote:
quoted hunk
If alloc_skb() failed we still hold hci_dev_list_lock.  The code should
unlock it before exit.

Signed-off-by: Vasiliy Kulikov <redacted>
---
 Compile tested only.

 net/bluetooth/mgmt.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f827fd9..ace8726 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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;
+       }
patch was send already on weekend
       hdr = (void *) skb_put(skb, sizeof(*hdr));
       hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help