Skip to content

Commit 02c5ea5

Browse files
Ying HsuVudentz
authored andcommitted
Bluetooth: Fix l2cap_disconnect_req deadlock
L2CAP assumes that the locks conn->chan_lock and chan->lock are acquired in the order conn->chan_lock, chan->lock to avoid potential deadlock. For example, l2sock_shutdown acquires these locks in the order: mutex_lock(&conn->chan_lock) l2cap_chan_lock(chan) However, l2cap_disconnect_req acquires chan->lock in l2cap_get_chan_by_scid first and then acquires conn->chan_lock before calling l2cap_chan_del. This means that these locks are acquired in unexpected order, which leads to potential deadlock: l2cap_chan_lock(c) mutex_lock(&conn->chan_lock) This patch releases chan->lock before acquiring the conn_chan_lock to avoid the potential deadlock. Fixes: a2a9339 ("Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}") Signed-off-by: Ying Hsu <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 47c5d82 commit 02c5ea5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/bluetooth/l2cap_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,7 +4663,9 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
46634663

46644664
chan->ops->set_shutdown(chan);
46654665

4666+
l2cap_chan_unlock(chan);
46664667
mutex_lock(&conn->chan_lock);
4668+
l2cap_chan_lock(chan);
46674669
l2cap_chan_del(chan, ECONNRESET);
46684670
mutex_unlock(&conn->chan_lock);
46694671

@@ -4702,7 +4704,9 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,
47024704
return 0;
47034705
}
47044706

4707+
l2cap_chan_unlock(chan);
47054708
mutex_lock(&conn->chan_lock);
4709+
l2cap_chan_lock(chan);
47064710
l2cap_chan_del(chan, 0);
47074711
mutex_unlock(&conn->chan_lock);
47084712

0 commit comments

Comments
 (0)