bluetooth l2cap: fix locking in l2cap_global_chan_by_psm
authorJohannes Berg <johannes.berg@intel.com>
Wed, 1 Jun 2011 06:29:54 +0000 (08:29 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jun 2011 18:35:54 +0000 (14:35 -0400)
read_lock() ... read_unlock_bh() is clearly bogus.
This was broken by

commit 23691d75cdc69c3b285211b4d77746aa20a17d18
Author: Gustavo F. Padovan <padovan@profusion.mobi>
Date:   Wed Apr 27 18:26:32 2011 -0300

    Bluetooth: Remove l2cap_sk_list

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/bluetooth/l2cap_core.c

index a86f9ba4f05cd473b6ccd20c17a1d293a459877a..e64a1c2df238d3fc0aac368075b8b0fd3bbb6917 100644 (file)
@@ -906,7 +906,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr
                if (c->psm == psm) {
                        /* Exact match. */
                        if (!bacmp(&bt_sk(sk)->src, src)) {
-                               read_unlock_bh(&chan_list_lock);
+                               read_unlock(&chan_list_lock);
                                return c;
                        }