Bluetooth: btusb: fix wakeup irq devres lifetime
Subsystems (2)
v3 cover Bluetooth: btusb: fix wakeup irq devres lifetime
This series fixes a couple of use-after-free issues and a wakeup source leak on probe failure and a (currently benign) OOB wakeup interrupt devres lifetime issue.
Included is also a related cleanup.
Note that these are intended for 7.1 (e.g. as the fixes are not critical) and apply on top of linux-next which has commit 2db5a8b68e31 ("Bluetooth: btusb: refactor endpoint lookup").
Johan
Changes in v3:
- fix use-after-free on registration failure (new patch)
- fix use-after-free on marvell probe failure (new patch)
Changes in v2:
- fix wakeup source leak (new patch)
- fix disconnect-while-suspended issue by making interrupt non-managed
- amend devres lifetime fix commit message with a reference to changed devres behaviour
- clean up error handling (new patch)
Johan Hovold (5):
Bluetooth: btusb: fix use-after-free on registration failure
Bluetooth: btusb: fix use-after-free on marvell probe failure
Bluetooth: btusb: fix wakeup source leak on probe failure
Bluetooth: btusb: fix wakeup irq devres lifetime
Bluetooth: btusb: clean up probe error handling
drivers/bluetooth/btusb.c | 61 +++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 18 deletions(-)
Signature · 1 line
2.52.0
PATCH v3 1/5 Bluetooth: btusb: fix use-after-free on registration failure
Make sure to release the sibling interfaces in case controller registration fails to avoid use-after-free and double-free when they are eventually disconnected.
This issue was reported by Sashiko while reviewing a fix for a wakeup source leak in the btusb probe errors paths.
--- drivers/bluetooth/btusb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +10 -1
@@ -4372,7 +4372,7 @@ static int btusb_probe(struct usb_interface *intf, err =hci_register_dev (hdev);if (err <0 ) - goto out_free_dev; + goto err_release_siblings;usb_set_intfdata (intf, data);
@@ -4381,6 +4381,15 @@ static int btusb_probe(struct usb_interface *intf,return 0 ; +err_release_siblings: +if (data->diag) { +usb_set_intfdata (data->diag,NULL ); +usb_driver_release_interface (&btusb_driver, data->diag); + } +if (data->isoc) { +usb_set_intfdata (data->isoc,NULL ); +usb_driver_release_interface (&btusb_driver, data->isoc); + } out_free_dev:if (data->reset_gpio)gpiod_put (data->reset_gpio);
Signature · 1 line
2.52.0
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/project/bluetooth/list/?series=1076527
---Test result---
Test Summary:
CheckPatch PENDING 0.45 seconds GitLint PENDING 0.29 seconds SubjectPrefix PASS 0.47 seconds BuildKernel PASS 24.97 seconds CheckAllWarning PASS 26.82 seconds CheckSparse PASS 29.65 seconds BuildKernel32 PASS 24.14 seconds TestRunnerSetup PASS 525.22 seconds TestRunner_l2cap-tester FAIL 28.52 seconds TestRunner_iso-tester PASS 40.06 seconds TestRunner_bnep-tester PASS 6.47 seconds TestRunner_mgmt-tester FAIL 112.80 seconds TestRunner_rfcomm-tester PASS 9.53 seconds TestRunner_sco-tester FAIL 14.52 seconds TestRunner_ioctl-tester PASS 10.16 seconds TestRunner_mesh-tester FAIL 12.51 seconds TestRunner_smp-tester PASS 8.68 seconds TestRunner_userchan-tester PASS 6.70 seconds IncrementalBuild PENDING 1.02 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner Output:
Total: 96, Passed: 95 (99.0%), Failed: 1, Not Run: 0
Failed Test Cases
L2CAP BR/EDR Server - Set PHY 3M Failed 0.116 seconds
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.116 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 2.573 seconds Mesh - Send cancel - 2 Timed out 1.997 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
Re: [PATCH v3 1/5] Bluetooth: btusb: fix use-after-free on registration failure
In reply to Johan HovoldDear Johan,
Thank you for looking into and fixing the additional comments.
Am 02.04.26 um 17:48 schrieb Johan Hovold:
Quoted 35 lines
Make sure to release the sibling interfaces in case controller registration fails to avoid use-after-free and double-free when they are eventually disconnected.
This issue was reported by Sashiko while reviewing a fix for a wakeup source leak in the btusb probe errors paths.
Fixes 9bfa35fe422c ("[Bluetooth] Add SCO support to btusb driver")Fixes 9d08f50401ac ("Bluetooth: btusb: Add support for Broadcom LM_DIAG interface")Cc [email protected] # 2.6.27Signed-off-by Johan Hovold <[email protected]>--- drivers/bluetooth/btusb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/bluetooth/btusb.c +3
-1@@ -4372,7 +4372,7 @@ static int btusb_probe(struct usb_interface *intf, err =hci_register_dev (hdev);if (err <0 ) - goto out_free_dev; + goto err_release_siblings;usb_set_intfdata (intf, data);@@ -4381,6 +4381,15 @@ static int btusb_probe(struct usb_interface *intf,return 0 ; +err_release_siblings: +if (data->diag) {
drivers/bluetooth/btusb.c static int btusb_probe(struct usb_interface *intf, · line 4395
Quoted 10 lines
drivers/bluetooth/btusb.c +7
-0+usb_set_intfdata (data->diag,NULL ); +usb_driver_release_interface (&btusb_driver, data->diag); + } +if (data->isoc) { +usb_set_intfdata (data->isoc,NULL ); +usb_driver_release_interface (&btusb_driver, data->isoc); + } out_free_dev:if (data->reset_gpio)gpiod_put (data->reset_gpio);
Kind regards,
Paul
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/project/bluetooth/list/?series=1076527
---Test result---
Test Summary:
CheckPatch PENDING 0.53 seconds GitLint PENDING 0.47 seconds SubjectPrefix PASS 0.31 seconds BuildKernel PASS 26.79 seconds CheckAllWarning PASS 29.28 seconds CheckSparse PASS 28.13 seconds BuildKernel32 PASS 25.66 seconds TestRunnerSetup PASS 583.75 seconds TestRunner_l2cap-tester FAIL 29.76 seconds TestRunner_iso-tester PASS 37.40 seconds TestRunner_bnep-tester PASS 6.60 seconds TestRunner_mgmt-tester FAIL 121.13 seconds TestRunner_rfcomm-tester PASS 9.65 seconds TestRunner_sco-tester FAIL 14.73 seconds TestRunner_ioctl-tester PASS 10.65 seconds TestRunner_mesh-tester FAIL 12.64 seconds TestRunner_smp-tester PASS 9.99 seconds TestRunner_userchan-tester PASS 6.94 seconds TestRunner_6lowpan-tester PASS 9.03 seconds IncrementalBuild PENDING 0.39 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner Output:
Total: 96, Passed: 95 (99.0%), Failed: 1, Not Run: 0
Failed Test Cases
L2CAP BR/EDR Server - Set PHY 3M Failed 0.120 seconds
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 494, Passed: 488 (98.8%), Failed: 2, Not Run: 4
Failed Test Cases
Pairing Acceptor - SMP over BR/EDR 2 Timed out 2.576 seconds Read Exp Feature - Success Failed 0.116 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
7.0.0-rc2-g974015308a27 #1 Not tainted
------------------------------------------------------
kworker/u5:2/117 is trying to acquire lock:ffff888002043240 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}, at: sco_connect_cfm+0x358/0x8d0
but task is already holding lock:ffff888002094c20 (&conn->lock){+.+.}-{3:3}, at: sco_connect_cfm+0x22d/0x8d0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&conn->lock){+.+.}-{3:3}:
lock_acquire+0xf7/0x2c0
_raw_spin_lock+0x2a/0x40
sco_sock_connect+0x4d7/0x1280
__sys_connect+0x1a3/0x260
__x64_sys_connect+0x6e/0xb0
do_syscall_64+0xa0/0x570
entry_SYSCALL_64_after_hwframe+0x74/0x7c-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}:
check_prev_add+0xe9/0xc70
__lock_acquire+0x1457/0x1df0
lock_acquire+0xf7/0x2c0
lock_sock_nested+0x36/0xd0
sco_connect_cfm+0x358/0x8d0
hci_sync_conn_complete_evt+0x3d3/0x8e0
hci_event_packet+0x74f/0xb10
hci_rx_work+0x398/0xd00
process_scheduled_works+0xb16/0x1ac0
worker_thread+0x4ff/0xba0
kthread+0x368/0x490
ret_from_fork+0x498/0x7e0
ret_from_fork_asm+0x19/0x30other info that might help us debug this:
...
BUG: sleeping function called from invalid context at net/core/sock.c:3782
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 117, name: kworker/u5:2preempt_count: 1, expected: 0
RCU nest depth: 0, expected: 0
INFO: lockdep is turned off.
CPU: 0 UID: 0 PID: 117 Comm: kworker/u5:2 Not tainted 7.0.0-rc2-g974015308a27 #1 PREEMPT(lazy) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Workqueue: hci0 hci_rx_work Call Trace: <TASK> dump_stack_lvl+0x49/0x60 __might_resched+0x2ea/0x500 lock_sock_nested+0x47/0xd0 ? sco_connect_cfm+0x358/0x8d0 sco_connect_cfm+0x358/0x8d0 ? hci_debugfs_create_conn+0x190/0x210 ? __pfx_sco_connect_cfm+0x10/0x10 hci_sync_conn_complete_evt+0x3d3/0x8e0 hci_event_packet+0x74f/0xb10 ? __pfx_hci_sync_conn_complete_evt+0x10/0x10 ? __pfx_hci_event_packet+0x10/0x10 ? mark_held_locks+0x49/0x80 ? lockdep_hardirqs_on_prepare+0xd4/0x180 ? _raw_spin_unlock_irqrestore+0x2c/0x50 hci_rx_work+0x398/0xd00 process_scheduled_works+0xb16/0x1ac0 ? __pfx_process_scheduled_works+0x10/0x10 ? lock_acquire+0xf7/0x2c0 ? lock_is_held_type+0x9b/0x110 ? __pfx_hci_rx_work+0x10/0x10 worker_thread+0x4ff/0xba0 ? _raw_spin_unlock_irqrestore+0x2c/0x50 ? __pfx_worker_thread+0x10/0x10 kthread+0x368/0x490 ? _raw_spin_unlock_irq+0x23/0x40 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x498/0x7e0 ? __pfx_ret_from_fork+0x10/0x10 ? __switch_to+0x9e4/0xe50 ? __switch_to_asm+0x32/0x60
...
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 2.609 seconds Mesh - Send cancel - 2 Timed out 1.994 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
https://github.com/bluez/bluetooth-next/pull/43/checks
---
Regards,
Linux Bluetooth
PATCH v3 2/5 Bluetooth: btusb: fix use-after-free on marvell probe failure
In reply to Johan HovoldMake sure to stop any TX URBs submitted during Marvell OOB wakeup configuration on later probe failures to avoid use-after-free in the completion callback.
This issue was reported by Sashiko while reviewing a fix for a wakeup source leak in the btusb probe errors paths.
--- drivers/bluetooth/btusb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/bluetooth/btusb.c +5 -3
@@ -4183,7 +4183,7 @@ static int btusb_probe(struct usb_interface *intf,if (id->driver_info &BTUSB_INTEL_COMBINED ) { err =btintel_configure_setup (hdev, btusb_driver.name);if (err) - goto out_free_dev; + goto err_kill_tx_urbs;/* Transport specific configuration */ hdev->send = btusb_send_frame_intel;
@@ -4346,7 +4346,7 @@ static int btusb_probe(struct usb_interface *intf, err =usb_set_interface (data->udev,0 ,0 );if (err <0 ) {BT_ERR ("failed to set interface 0, alt 0 %d" , err); - goto out_free_dev; + goto err_kill_tx_urbs; } }
@@ -4354,7 +4354,7 @@ static int btusb_probe(struct usb_interface *intf, err =usb_driver_claim_interface (&btusb_driver, data->isoc, data);if (err <0 ) - goto out_free_dev; + goto err_kill_tx_urbs; }if (IS_ENABLED (CONFIG_BT_HCIBTUSB_BCM ) && data->diag) {
@@ -4390,6 +4390,8 @@ static int btusb_probe(struct usb_interface *intf,usb_set_intfdata (data->isoc,NULL );usb_driver_release_interface (&btusb_driver, data->isoc); } +err_kill_tx_urbs: +usb_kill_anchored_urbs (&data->tx_anchor); out_free_dev:if (data->reset_gpio)gpiod_put (data->reset_gpio);
Signature · 1 line
2.52.0
PATCH v3 3/5 Bluetooth: btusb: fix wakeup source leak on probe failure
In reply to Johan HovoldMake sure to disable wakeup on probe failure to avoid leaking the wakeup source.
--- drivers/bluetooth/btusb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +4 -1
@@ -4146,7 +4146,7 @@ static int btusb_probe(struct usb_interface *intf,if (id->driver_info &BTUSB_MARVELL && data->oob_wake_irq) { err =marvell_config_oob_wake (hdev);if (err) - goto out_free_dev; + goto err_disable_wakeup; }#endif if (id->driver_info &BTUSB_CW6622 )
@@ -4392,6 +4392,9 @@ static int btusb_probe(struct usb_interface *intf, } err_kill_tx_urbs:usb_kill_anchored_urbs (&data->tx_anchor); +err_disable_wakeup: +if (data->oob_wake_irq) +device_init_wakeup (&data->udev->dev, false); out_free_dev:if (data->reset_gpio)gpiod_put (data->reset_gpio);
Signature · 1 line
2.52.0
PATCH v3 4/5 Bluetooth: btusb: fix wakeup irq devres lifetime
In reply to Johan HovoldThe OOB wakeup interrupt is device managed but its lifetime is incorrectly tied to the child HCI device rather than the USB interface to which the driver is bound.
This should not cause any trouble currently as the interrupt will be disabled when the HCI device is deregistered on disconnect (but this was not always the case, see [1]), and there should be no further references if probe fails before registering it. But it is still technically wrong as the reference counted HCI device could in theory remain after a probe failure.
Explicitly free the interrupt on disconnect so that it is guaranteed to be disabled before freeing the (non-managed) driver data (including if disconnected while suspended).
[1] 699fb50d9903 ("drivers: base: Free devm resources when unregistering a device")
--- drivers/bluetooth/btusb.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/bluetooth/btusb.c +15 -5
@@ -3784,8 +3784,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) }irq_set_status_flags (irq,IRQ_NOAUTOEN ); - ret =devm_request_irq (&hdev->dev, irq, btusb_oob_wake_handler, -0 ,"OOB Wake-on-BT" , data); + ret =request_irq (irq, btusb_oob_wake_handler,0 ,"OOB Wake-on-BT" , data);if (ret) {bt_dev_err (hdev,"%s: IRQ request failed" , __func__);return ret;
@@ -3794,12 +3793,18 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) ret =device_init_wakeup (dev, true);if (ret) {bt_dev_err (hdev,"%s: failed to init_wakeup" , __func__); -return ret; + goto err_free_irq; } data->oob_wake_irq = irq;bt_dev_info (hdev,"OOB Wake-on-BT configured at IRQ %u" , irq); +return 0 ; + +err_free_irq: +free_irq (irq, data); + + return ret; }#endif
@@ -4393,8 +4398,10 @@ static int btusb_probe(struct usb_interface *intf, err_kill_tx_urbs:usb_kill_anchored_urbs (&data->tx_anchor); err_disable_wakeup: -if (data->oob_wake_irq) +if (data->oob_wake_irq) {device_init_wakeup (&data->udev->dev, false); +free_irq (data->oob_wake_irq, data); + } out_free_dev:if (data->reset_gpio)gpiod_put (data->reset_gpio);
@@ -4427,8 +4434,11 @@ static void btusb_disconnect(struct usb_interface *intf)hci_unregister_dev (hdev); -if (data->oob_wake_irq) +if (data->oob_wake_irq) {device_init_wakeup (&data->udev->dev, false); +free_irq (data->oob_wake_irq, data); + } +if (data->reset_gpio)gpiod_put (data->reset_gpio);
Signature · 1 line
2.52.0
PATCH v3 5/5 Bluetooth: btusb: clean up probe error handling
In reply to Johan HovoldClean up probe error handling by using dedicated error labels with an "err" prefix.
Note that the endpoint lookup helper returns -ENXIO when endpoints are missing which is functionally equivalent to returning -ENODEV.
--- drivers/bluetooth/btusb.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/bluetooth/btusb.c +10 -9
@@ -4055,10 +4055,8 @@ static int btusb_probe(struct usb_interface *intf, err =usb_find_common_endpoints (intf->cur_altsetting, &data->bulk_rx_ep, &data->bulk_tx_ep, &data->intr_ep,NULL ); -if (err) { -kfree (data); -return -ENODEV ; - } +if (err) + goto err_free_data;if (id->driver_info &BTUSB_AMP ) { data->cmdreq_type =USB_TYPE_CLASS |0x01 ;
@@ -4114,8 +4112,8 @@ static int btusb_probe(struct usb_interface *intf, hdev =hci_alloc_dev_priv (priv_size);if (!hdev) { -kfree (data); -return -ENOMEM ; + err = -ENOMEM ; + goto err_free_data; } hdev->bus =HCI_USB ;
@@ -4129,7 +4127,7 @@ static int btusb_probe(struct usb_interface *intf, GPIOD_OUT_LOW);if (IS_ERR (reset_gpio)) { err =PTR_ERR (reset_gpio); - goto out_free_dev; + goto err_free_hdev; }else if (reset_gpio) { data->reset_gpio = reset_gpio; }
@@ -4145,7 +4143,7 @@ static int btusb_probe(struct usb_interface *intf,#ifdef CONFIG_PM err =btusb_config_oob_wake (hdev);if (err) - goto out_free_dev; + goto err_put_reset;/* Marvell devices may need a specific chip configuration */ if (id->driver_info &BTUSB_MARVELL && data->oob_wake_irq) {
@@ -4402,11 +4400,14 @@ static int btusb_probe(struct usb_interface *intf,device_init_wakeup (&data->udev->dev, false);free_irq (data->oob_wake_irq, data); } -out_free_dev: +err_put_reset:if (data->reset_gpio)gpiod_put (data->reset_gpio); +err_free_hdev:hci_free_dev (hdev); +err_free_data:kfree (data); +return err; }
Signature · 1 line
2.52.0
Quoted 9 lines · Johan Hovold
This series fixes a couple of use-after-free issues and a wakeup source leak on probe failure and a (currently benign) OOB wakeup interrupt devres lifetime issue.
Included is also a related cleanup.
Note that these are intended for 7.1 (e.g. as the fixes are not critical) and apply on top of linux-next which has commit
2db5a8b68e31("Bluetooth: btusb: refactor endpoint lookup").
Can these be picked up now (for 7.1 or 7.2)?
Johan