Skip to content

Commit 09d2b3c

Browse files
committed
Bluetooth: Fix l2cap_disconnect_req deadlock
jira VULN-154997 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: Roxana Nicolescu <rnicolescu@ciq.com>
1 parent 3695251 commit 09d2b3c

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

46444644
chan->ops->set_shutdown(chan);
46454645

4646+
l2cap_chan_unlock(chan);
46464647
mutex_lock(&conn->chan_lock);
4648+
l2cap_chan_lock(chan);
46474649
l2cap_chan_del(chan, ECONNRESET);
46484650
mutex_unlock(&conn->chan_lock);
46494651

@@ -4683,7 +4685,9 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,
46834685
return 0;
46844686
}
46854687

4688+
l2cap_chan_unlock(chan);
46864689
mutex_lock(&conn->chan_lock);
4690+
l2cap_chan_lock(chan);
46874691
l2cap_chan_del(chan, 0);
46884692
mutex_unlock(&conn->chan_lock);
46894693

0 commit comments

Comments
 (0)