Skip to content

Commit 26ca6d1

Browse files
committed
Bluetooth: Fix l2cap_disconnect_req deadlock
jira VULN-155000 cve-pre CVE-2023-53297 commit-author Ying Hsu <yinghsu@chromium.org> commit 02c5ea5 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 <yinghsu@chromium.org> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> (cherry picked from commit 02c5ea5) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent cadafab commit 26ca6d1

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
@@ -4609,7 +4609,9 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
46094609

46104610
chan->ops->set_shutdown(chan);
46114611

4612+
l2cap_chan_unlock(chan);
46124613
mutex_lock(&conn->chan_lock);
4614+
l2cap_chan_lock(chan);
46134615
l2cap_chan_del(chan, ECONNRESET);
46144616
mutex_unlock(&conn->chan_lock);
46154617

@@ -4649,7 +4651,9 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,
46494651
return 0;
46504652
}
46514653

4654+
l2cap_chan_unlock(chan);
46524655
mutex_lock(&conn->chan_lock);
4656+
l2cap_chan_lock(chan);
46534657
l2cap_chan_del(chan, 0);
46544658
mutex_unlock(&conn->chan_lock);
46554659

0 commit comments

Comments
 (0)