summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 23:34:34 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-14 23:34:34 +0200
commit62f3a2cfb1891c070631e496eeea852e949ea8bb (patch)
tree2d1a6d60f612f14fd7fdb9bd256f621cac0dc544 /net
parentBluetooth: Don't lock sock inside l2cap_get_sock_by_scid() (diff)
downloadlinux-62f3a2cfb1891c070631e496eeea852e949ea8bb.tar.xz
linux-62f3a2cfb1891c070631e496eeea852e949ea8bb.zip
Bluetooth: Fix another locking unbalance
l2cap_get_sock_by_scid was changed to not lock the socket anymore, but I forgot to change all the users of this function. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d5db5a38df6a..bc84ed1b3320 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -632,6 +632,8 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)
if (!parent)
return;
+ bh_lock_sock(parent);
+
/* Check for backlog size */
if (sk_acceptq_is_full(parent)) {
BT_DBG("backlog full %d", parent->sk_ack_backlog);