Skip to content

Bluetooth: L2CAP: fix and annotate l2cap_conn::chan_l locking

Pauli Virtanen linux-bluetooth lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 patches 2 repliesIn review 14 of 16 applied

Patches in v1 14 of 16 applied

#Subject and filesSizeRepliesApplied
1/16Bluetooth: L2CAP: take chan->lock for l2cap_chan_add/ready/delinclude/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+17 -11 replyApplied
2/16Bluetooth: L2CAP: add l2cap_chan_close_unlocked() and locking helpersinclude/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+73 -50 repliesApplied
3/16Bluetooth: L2CAP: fix race condition in l2cap_sock_shutdown()net/bluetooth/l2cap_sock.c+1 -180 repliesApplied
4/16Bluetooth: 6lowpan: use l2cap_chan_close_unlocked()net/bluetooth/6lowpan.c+9 -180 repliesApplied
5/16Bluetooth: L2CAP: remove unused l2cap_chan_close()include/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+0 -70 repliesApplied
6/16Bluetooth: 6lowpan: avoid concurrent peer_del() in bt_6lowpan_disconnectnet/bluetooth/6lowpan.c+14 -30 repliesApplied
7/16Bluetooth: L2CAP: hold conn->lock for __l2cap_ecred_conn_rsp_defernet/bluetooth/l2cap_sock.c+51 -230 repliesApplied
8/16Bluetooth: L2CAP: hold l2cap_conn::lock in l2cap_connect_cfm()net/bluetooth/l2cap_core.c+4 -00 repliesApplied
9/16Bluetooth: L2CAP: add annotations for l2cap_chan list lockinginclude/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+61 -70 repliesApplied
10/16Bluetooth: L2CAP: take lock for l2cap_chan_del in l2cap_ecred_rsp_deferinclude/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+64 -00 replies
11/16Bluetooth: L2CAP: hold chan in l2cap_ecred_conn_rsp()net/bluetooth/l2cap_core.c+5 -00 repliesApplied
12/16Bluetooth: L2CAP: annotate locking for l2cap_chan_del()include/net/bluetooth/l2cap.h net/bluetooth/6lowpan.c net/bluetooth/l2cap_core.c+74 -330 repliesApplied
13/16Bluetooth: L2CAP: annotate locking for l2cap_ops callbacksinclude/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c+10 -40 repliesApplied
14/16Bluetooth: L2CAP: make concurrent l2cap_set_timer() refcounting safeinclude/net/bluetooth/l2cap.h+4 -50 repliesApplied
15/16Bluetooth: L2CAP: remove conditional locking from l2cap_connect()net/bluetooth/l2cap_core.c+7 -50 repliesApplied
16/16Bluetooth: L2CAP: refuse __l2cap_chan_add if chan already has connnet/bluetooth/l2cap_core.c net/bluetooth/l2cap_sock.c+8 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/16] Bluetooth: L2CAP: fix and annotate l2cap_conn::chan_l locking

The intent in current code is that:

- l2cap_conn::chan_l read/write is guarded by l2cap_conn::lock

- l2cap_chan_del called with held l2cap_chan::lock (l2cap_sock.c uses this)

This is currently not done right in several code paths.

This series fixes the locking vs. the above, and adds context analysis annotations to make more sure it is systematic.

The last three patches fix some miscellaneous locking related issues.

Mostly straightforward, but two more complicated parts:

- race condition in acquiring l2cap_conn::lock & l2cap_chan::lock

- __l2cap_ecred_conn_rsp_defer(chan) may l2cap_chan_del other l2cap_chan

To deal with these, this series adds

- l2cap_chan_lock_conn / l2cap_chan_unlock_conn
- l2cap_chan_close_unlocked
- l2cap_chan_try_sibling_lock-
- new nesting rule for l2cap_conn::lock

The context analysis annotations for l2cap_chan_close() declare via context_unsafe() that __must_hold(&chan->conn->lock) even if chan->conn is NULL. This is OK for the current static locking analysis, doesn't affect code generation. It could be cleaner by adding separate l2cap_chan_del() variant assuming chan->conn == NULL, but playing loose here avoids such duplication.

LLM tools were used for patch review, catching some some corner cases before sending this series out. No code / commit messages are generated by them.

Finding the bugs here is mostly based on adding the context analysis annotations which make it obvious where appropriate locks are missing.

Assisted-by gpt-5.6 deepseek-4-flash

Pauli Virtanen (16):
Bluetooth: L2CAP: take chan->lock for l2cap_chan_add/ready/del
Bluetooth: L2CAP: add l2cap_chan_close_unlocked() and locking helpers
Bluetooth: L2CAP: fix race condition in l2cap_sock_shutdown()
Bluetooth: 6lowpan: use l2cap_chan_close_unlocked()
Bluetooth: L2CAP: remove unused l2cap_chan_close()
Bluetooth: 6lowpan: avoid concurrent peer_del() in
bt_6lowpan_disconnect
Bluetooth: L2CAP: hold conn->lock for __l2cap_ecred_conn_rsp_defer
Bluetooth: L2CAP: hold l2cap_conn::lock in l2cap_connect_cfm()
Bluetooth: L2CAP: add annotations for l2cap_chan list locking
Bluetooth: L2CAP: take lock for l2cap_chan_del in
l2cap_ecred_rsp_defer
Bluetooth: L2CAP: hold chan in l2cap_ecred_conn_rsp()
Bluetooth: L2CAP: annotate locking for l2cap_chan_del()
Bluetooth: L2CAP: annotate locking for l2cap_ops callbacks
Bluetooth: L2CAP: make concurrent l2cap_set_timer() refcounting safe
Bluetooth: L2CAP: remove conditional locking from l2cap_connect()
Bluetooth: L2CAP: refuse __l2cap_chan_add if chan already has conn

 include/net/bluetooth/l2cap.h | 100 ++++++++-----
 net/bluetooth/6lowpan.c       |  44 +++---
 net/bluetooth/l2cap_core.c    | 257 +++++++++++++++++++++++++++++++---
 net/bluetooth/l2cap_sock.c    |  95 +++++++------
 4 files changed, 384 insertions(+), 112 deletions(-)
Signature · 1 line
2.55.0