* [PATCH] Bluetooth: hci_sync: invoke destroy callbacks outside lock
@ 2026-11-21 12:01 Zheng Shuhao
2026-11-21 17:21 ` bluez.test.bot
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Shuhao @ 2026-11-21 12:01 UTC (permalink / raw)
To: linux-bluetooth; +Cc: marcel, luiz.dentz, linux-kernel
hci_cmd_sync_clear() cancels queued command-sync entries while holding
cmd_sync_work_lock. Cancellation invokes entry->destroy(), and
add_ext_adv_params_complete() takes hdev->lock. In the opposite direction,
le_conn_complete_evt() holds hdev->lock while hci_update_passive_scan()
queues work and acquires cmd_sync_work_lock. This creates the circular
locking dependency reported by lockdep during controller teardown.
Detach the queued entries to a local list under cmd_sync_work_lock, then
run the cancellation callbacks after releasing the mutex. This keeps
queue updates serialized without invoking callbacks under the mutex.
Testing:
- Lockdep-enabled QEMU baseline: reproducer completed twice and emitted
the circular-locking warning once.
- Patched QEMU kernel: reproducer completed five times with no such
warning.
- Bluetooth ECDH and SMP self-tests passed in both kernels.
- Both kernels built; baseline build logged a timestamp clock-skew
warning. checkpatch.pl --strict reported no errors or warnings.
Fixes: 1c66bee492a5 ("Bluetooth: Fix race condition in hci_cmd_sync_clear")
Reported-by: syzbot+fc55a609cd9deea4ea37@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=fc55a609cd9deea4ea37
Signed-off-by: Zheng Shuhao <viennaoffh@gmail.com>
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index ea2014e74..65b8aa4ad 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -683,6 +683,7 @@ static void _hci_cmd_sync_cancel_entry(struct hci_dev *hdev,
void hci_cmd_sync_clear(struct hci_dev *hdev)
{
+ LIST_HEAD(cancel_list);
struct hci_cmd_sync_work_entry *entry, *tmp;
/* cmd_work is disabled, the pending request can only time out */
@@ -690,10 +691,13 @@ void hci_cmd_sync_clear(struct hci_dev *hdev)
cancel_work_sync(&hdev->cmd_sync_work);
cancel_work_sync(&hdev->reenable_adv_work);
+ /* Run destroy callbacks without holding cmd_sync_work_lock. */
mutex_lock(&hdev->cmd_sync_work_lock);
- list_for_each_entry_safe(entry, tmp, &hdev->cmd_sync_work_list, list)
- _hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);
+ list_splice_init(&hdev->cmd_sync_work_list, &cancel_list);
mutex_unlock(&hdev->cmd_sync_work_lock);
+
+ list_for_each_entry_safe(entry, tmp, &cancel_list, list)
+ _hci_cmd_sync_cancel_entry(hdev, entry, -ECANCELED);
}
void hci_cmd_sync_cancel(struct hci_dev *hdev, int err)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: Bluetooth: hci_sync: invoke destroy callbacks outside lock
2026-11-21 12:01 [PATCH] Bluetooth: hci_sync: invoke destroy callbacks outside lock Zheng Shuhao
@ 2026-11-21 17:21 ` bluez.test.bot
0 siblings, 0 replies; 2+ messages in thread
From: bluez.test.bot @ 2026-11-21 17:21 UTC (permalink / raw)
To: linux-bluetooth, viennaoffh
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/series/1218076/
---Test result---
Test Summary:
CheckPatch PASS 0.61 seconds
VerifyFixes PASS 0.07 seconds
VerifySignedoff PASS 0.07 seconds
GitLint PASS 0.23 seconds
SubjectPrefix PASS 0.07 seconds
BuildKernel PASS 31.62 seconds
CheckAllWarning PASS 35.35 seconds
CheckSparse PASS 39.02 seconds
BuildKernel32 PASS 32.20 seconds
CheckKernelLLVM PASS 35.33 seconds
TestRunnerSetup PASS 767.08 seconds
TestRunner_l2cap-tester PASS 14.71 seconds
TestRunner_iso-tester PASS 13.21 seconds
TestRunner_bnep-tester PASS 3.12 seconds
TestRunner_mgmt-tester PASS 88.95 seconds
TestRunner_rfcomm-tester PASS 4.48 seconds
TestRunner_sco-tester PASS 5.60 seconds
TestRunner_ioctl-tester PASS 4.59 seconds
TestRunner_mesh-tester PASS 4.49 seconds
TestRunner_smp-tester PASS 4.30 seconds
TestRunner_userchan-tester PASS 3.18 seconds
TestRunner_6lowpan-tester PASS 4.48 seconds
IncrementalBuild PASS 29.72 seconds
https://github.com/bluez/bluetooth-next/pull/1176
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-21 17:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-21 12:01 [PATCH] Bluetooth: hci_sync: invoke destroy callbacks outside lock Zheng Shuhao
2026-11-21 17:21 ` bluez.test.bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.