[PATCH v3 03/31] USB: Lock interfaces during manual driver binding

From: Leon Romanovsky

Date: Wed Nov 18 2026 - 14:28:34 EST


From: Leon Romanovsky <leonro@xxxxxxxxxx>

Driver core requires the claimed interface's device lock during binding.
The parent USB device lock alone does not satisfy this requirement.

Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/bluetooth/btusb_main.c | 2 --
drivers/usb/core/driver.c | 15 ++++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/bluetooth/btusb_main.c b/drivers/bluetooth/btusb_main.c
index 8307fd819cc2e..f7f312af35c81 100644
--- a/drivers/bluetooth/btusb_main.c
+++ b/drivers/bluetooth/btusb_main.c
@@ -3024,10 +3024,8 @@ static int btusb_mtk_claim_iso_intf(struct btusb_data *data)
if (err)
goto err_put_interface;

- device_lock(&btmtk_data->isopkt_intf->dev);
err = usb_driver_claim_interface(&btusb_driver,
btmtk_data->isopkt_intf, data);
- device_unlock(&btmtk_data->isopkt_intf->dev);
if (err)
goto err_unlock;

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d3a61ebc6afb0..e1de348cc0cac 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -540,9 +540,8 @@ static void usb_shutdown_interface(struct device *dev)
* No device driver should directly modify internal usb_interface or
* usb_device structure members.
*
- * Callers must own the device lock, so driver probe() entries don't need
- * extra locking, but other call contexts may need to explicitly claim that
- * lock.
+ * Callers must hold the parent USB device lock, but not the claimed
+ * interface's device lock.
*
* Return: 0 on success.
*/
@@ -559,9 +558,13 @@ int usb_driver_claim_interface(struct usb_driver *driver,
if (dev->driver)
return -EBUSY;

+ device_lock(dev);
+
/* reject claim if interface is not authorized */
- if (!iface->authorized)
- return -ENODEV;
+ if (!iface->authorized) {
+ retval = -ENODEV;
+ goto unlock;
+ }

dev->driver = &driver->driver;
usb_set_intfdata(iface, data);
@@ -602,6 +605,8 @@ int usb_driver_claim_interface(struct usb_driver *driver,
pm_runtime_set_suspended(dev);
}

+unlock:
+ device_unlock(dev);
return retval;
}
EXPORT_SYMBOL_GPL(usb_driver_claim_interface);

--
2.56.1