]> git.ipfire.org Git - thirdparty/linux.git/commit
Bluetooth: L2CAP: Fix deadlock in l2cap_conn_del()
authorHyunwoo Kim <imv4bel@gmail.com>
Fri, 20 Mar 2026 11:01:26 +0000 (20:01 +0900)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 25 Mar 2026 19:32:09 +0000 (15:32 -0400)
commit00fdebbbc557a2fc21321ff2eaa22fd70c078608
tree78ec540badf8b00a2a85e4de5a5247203164db61
parent94d8e6fe5d0818e9300e514e095a200bd5ff93ae
Bluetooth: L2CAP: Fix deadlock in l2cap_conn_del()

l2cap_conn_del() calls cancel_delayed_work_sync() for both info_timer
and id_addr_timer while holding conn->lock. However, the work functions
l2cap_info_timeout() and l2cap_conn_update_id_addr() both acquire
conn->lock, creating a potential AB-BA deadlock if the work is already
executing when l2cap_conn_del() takes the lock.

Move the work cancellations before acquiring conn->lock and use
disable_delayed_work_sync() to additionally prevent the works from
being rearmed after cancellation, consistent with the pattern used in
hci_conn_del().

Fixes: ab4eedb790ca ("Bluetooth: L2CAP: Fix corrupted list in hci_chan_del")
Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
net/bluetooth/l2cap_core.c