[PATCH] Bluetooth: MSFT: Serialize handle map cleanup with event processing

[PATCH] Bluetooth: MSFT: Serialize handle map cleanup with event processing

[Cen Zhang]

MSFT monitor handle mappings must remain valid while vendor events look
up and use them under hdev->lock. msft_do_close() removes and frees the
mappings without that lock.

hci_dev_close_sync() clears HCI_UP and drains the RX workqueue before
MSFT cleanup. However, a transport callback that already passed
hci_recv_frame()'s state check can queue a vendor event after the drain
returns, if no earlier shutdown callback has quiesced reception. The
driver close callback runs after MSFT cleanup, so event processing can
overlap the unlocked removal. msft_monitor_device_evt() can then
traverse freed list entries or read handle_data->mgmt_handle after it is
freed.

Take hdev->lock while resetting monitor states and removing handle
mappings in msft_do_close(), as normal monitor cancellation already
does. An active event reader then finishes before its mapping is freed,
and later lookups see an empty handle map.

An instrumented kernel produced the following report:

    BUG: KASAN: slab-use-after-free in msft_vendor_evt+0x1906/0x1990
        [Thu Oct  1 15:01:51 2026] Read of size 2 at addr ffff888104df3602
    by task kworker/u17:2/502
    [...]
    [Thu Oct  1 15:01:51 2026] Workqueue: hci0 hci_rx_work
    [Thu Oct  1 15:01:51 2026] Call Trace:
    [...]
    [Thu Oct  1 15:01:51 2026]  msft_vendor_evt+0x1906/0x1990
    [Thu Oct  1 15:01:51 2026]  hci_vendor_evt+0x6f/0x90
    [Thu Oct  1 15:01:51 2026]  hci_event_packet+0x894/0xc70
    [...]
    [Thu Oct  1 15:01:51 2026]  hci_rx_work+0x3f8/0xfa0
    [...]
    [Thu Oct  1 15:01:51 2026] Freed by task 499:
    [...]
    [Thu Oct  1 15:01:51 2026]  kfree+0x307/0x580
    [Thu Oct  1 15:01:51 2026]  msft_do_close+0x238/0x750
    [Thu Oct  1 15:01:51 2026]  hci_dev_close_sync+0x546/0x1380
    [...]
        [Thu Oct  1 15:01:51 2026] The buggy address belongs to the object
    at ffff888104df3600
                                                                which
                                belongs to the cache kmalloc-32 of size 32
        [Thu Oct  1 15:01:51 2026] The buggy address is located 2 bytes
    inside of
                                                                freed
                                32-byte region [ffff888104df3600,
                                ffff888104df3620)
    [...]

Fixes: 145373cb1b1f ("Bluetooth: Add framework for Microsoft vendor extension")
Assisted-by: LLM
Signed-off-by: Cen Zhang <zzzccc427@gmail.com>
---
diff --git a/net/bluetooth/msft.c b/net/bluetooth/msft.c
index d9dd722db3..667c9951c3 100644
--- a/net/bluetooth/msft.c
+++ b/net/bluetooth/msft.c
@@ -681,6 +681,8 @@ void msft_do_close(struct hci_dev *hdev)
 
 	bt_dev_dbg(hdev, "Cleanup of MSFT extension");
 
+	hci_dev_lock(hdev);
+
 	/* The controller will silently remove all monitors on power off.
 	 * Therefore, remove handle_data mapping and reset monitor state.
 	 */
@@ -695,6 +697,8 @@ void msft_do_close(struct hci_dev *hdev)
 		kfree(handle_data);
 	}
 
+	hci_dev_unlock(hdev);
+
 	mutex_lock(&msft->filter_lock);
 	list_for_each_entry_safe(address_filter, n, &msft->address_filters,
 				 list) {

RE: Bluetooth: MSFT: Serialize handle map cleanup with event processing

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1605 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/1181295/

---Test result---

Test Summary:
CheckPatch                    PASS      0.77 seconds
VerifyFixes                   PASS      0.14 seconds
VerifySignedoff               PASS      0.63 seconds
GitLint                       PASS      0.35 seconds
SubjectPrefix                 PASS      0.13 seconds
BuildKernel                   PASS      29.15 seconds
CheckAllWarning               PASS      33.89 seconds
CheckSparse                   PASS      36.72 seconds
BuildKernel32                 PASS      29.72 seconds
CheckKernelLLVM               PASS      33.71 seconds
TestRunnerSetup               PASS      791.83 seconds
TestRunner_l2cap-tester       PASS      12.87 seconds
TestRunner_iso-tester         PASS      11.00 seconds
TestRunner_bnep-tester        PASS      3.11 seconds
TestRunner_mgmt-tester        PASS      61.63 seconds
TestRunner_rfcomm-tester      PASS      4.47 seconds
TestRunner_sco-tester         PASS      5.64 seconds
TestRunner_ioctl-tester       PASS      5.61 seconds
TestRunner_mesh-tester        PASS      5.55 seconds
TestRunner_smp-tester         PASS      4.35 seconds
TestRunner_userchan-tester    PASS      3.21 seconds
TestRunner_6lowpan-tester     PASS      4.44 seconds
IncrementalBuild              PASS      27.71 seconds



https://github.com/bluez/bluetooth-next/pull/886

---
Regards,
Linux Bluetooth