public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/3] Bluetooth: btusb: fix wakeup irq devres lifetime
@ 2026-04-02  9:27 Johan Hovold
  2026-04-02  9:27 ` [PATCH v2 1/3] Bluetooth: btusb: fix wakeup source leak on probe failure Johan Hovold
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Johan Hovold @ 2026-04-02  9:27 UTC (permalink / raw)
  To: Luiz Augusto von Dentz, Marcel Holtmann
  Cc: linux-bluetooth, linux-kernel, Johan Hovold

This series fixes a wakeup source leak 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 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 (3):
  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 | 50 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 18 deletions(-)

-- 
2.52.0


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH v3 1/5] Bluetooth: btusb: fix use-after-free on registration failure
@ 2026-04-02 15:48 Johan Hovold
  2026-04-02 17:13 ` Bluetooth: btusb: fix wakeup irq devres lifetime bluez.test.bot
  2026-04-09 20:20 ` bluez.test.bot
  0 siblings, 2 replies; 9+ messages in thread
From: Johan Hovold @ 2026-04-02 15:48 UTC (permalink / raw)
  To: Luiz Augusto von Dentz, Marcel Holtmann
  Cc: linux-bluetooth, linux-kernel, Johan Hovold, stable

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.

Link: https://sashiko.dev/#/patchset/20260402092704.2346710-1-johan%40kernel.org
Fixes: 9bfa35fe422c ("[Bluetooth] Add SCO support to btusb driver")
Fixes: 9d08f50401ac ("Bluetooth: btusb: Add support for Broadcom LM_DIAG interface")
Cc: stable@vger.kernel.org	# 2.6.27
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/bluetooth/btusb.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 21e85c212506..97de6e6e7dbc 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -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);
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] Bluetooth: btusb: fix wakeup irq devres lifetime
@ 2026-03-30  9:33 Johan Hovold
  2026-03-30 10:15 ` bluez.test.bot
  0 siblings, 1 reply; 9+ messages in thread
From: Johan Hovold @ 2026-03-30  9:33 UTC (permalink / raw)
  To: Luiz Augusto von Dentz, Marcel Holtmann
  Cc: linux-bluetooth, linux-kernel, Johan Hovold, Rajat Jain

The OOB wakeup irq 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 is only
enabled during suspend, but it is technically wrong as the reference
counted HCI device could remain after the driver has been unbound.

Note that the data passed to the interrupt handler is not device managed
and is typically freed before the interrupt during disconnect, but this
is also safe as long as the interrupt is disabled.

Fixes: fd913ef7ce61 ("Bluetooth: btusb: Add out-of-band wakeup support")
Cc: Rajat Jain <rajatja@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/bluetooth/btusb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 5c535f3ab722..4c5344ce16c1 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3801,7 +3801,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,
+	ret = devm_request_irq(&data->intf->dev, irq, btusb_oob_wake_handler,
 			       0, "OOB Wake-on-BT", data);
 	if (ret) {
 		bt_dev_err(hdev, "%s: IRQ request failed", __func__);
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2026-04-09 20:20 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-02  9:27 [PATCH v2 0/3] Bluetooth: btusb: fix wakeup irq devres lifetime Johan Hovold
2026-04-02  9:27 ` [PATCH v2 1/3] Bluetooth: btusb: fix wakeup source leak on probe failure Johan Hovold
2026-04-02 10:17   ` Bluetooth: btusb: fix wakeup irq devres lifetime bluez.test.bot
2026-04-02  9:27 ` [PATCH v2 2/3] " Johan Hovold
2026-04-02  9:27 ` [PATCH v2 3/3] Bluetooth: btusb: clean up probe error handling Johan Hovold
2026-04-02 14:16 ` [PATCH v2 0/3] Bluetooth: btusb: fix wakeup irq devres lifetime Johan Hovold
  -- strict thread matches above, loose matches on Subject: below --
2026-04-02 15:48 [PATCH v3 1/5] Bluetooth: btusb: fix use-after-free on registration failure Johan Hovold
2026-04-02 17:13 ` Bluetooth: btusb: fix wakeup irq devres lifetime bluez.test.bot
2026-04-09 20:20 ` bluez.test.bot
2026-03-30  9:33 [PATCH] " Johan Hovold
2026-03-30 10:15 ` bluez.test.bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox