[PATCH v3 09/31] USB: Pin modules for unregistered interface claims
From: Leon Romanovsky
Date: Wed Nov 18 2026 - 14:30:58 EST
From: Leon Romanovsky <leonro@xxxxxxxxxx>
A successful CDC-ACM control probe can claim its data interface before
registration. If data registration fails, cleanup can race with module
unload when no tty is open:
Thread A (cleanup) Thread B (unload)
usb_driver_release_refused_claim(data)
usb_unbind_interface(data)
acm_disconnect(data)
usb_driver_release_interface(control)
device_release_driver(control)
device_release_driver_internal()
__device_release_driver()
klist_remove() [last bound interface]
delete_module()
acm_exit()
usb_deregister()
driver_unregister()
bus_remove_driver()
driver_detach()
[empty list]
free_module()
[resumes in freed acm_disconnect()]
tty_port_put()
The empty list lets unload skip the USB device lock and free the module
before the callback returns. Hold a module reference through registration
or cleanup, preparing for the cleanup added next.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/usb/core/driver.c | 17 +++++++++++++++++
drivers/usb/core/message.c | 6 ++++++
drivers/usb/core/usb.h | 1 +
include/linux/usb.h | 2 ++
4 files changed, 26 insertions(+)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 0a6fdf2e88f4e..b7bd9226d2627 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -529,6 +529,13 @@ static void usb_shutdown_interface(struct device *dev)
driver->shutdown(intf);
}
+void usb_put_claim_owner(struct usb_interface *intf)
+{
+ struct module *owner = xchg(&intf->claim_owner, NULL);
+
+ module_put(owner);
+}
+
/**
* usb_driver_claim_interface - bind a driver to an interface
* @driver: the driver to be bound
@@ -567,6 +574,14 @@ int usb_driver_claim_interface(struct usb_driver *driver,
goto unlock;
}
+ if (!device_is_registered(dev)) {
+ if (!try_module_get(driver->driver.owner)) {
+ retval = -ENODEV;
+ goto unlock;
+ }
+ iface->claim_owner = driver->driver.owner;
+ }
+
dev->driver = &driver->driver;
usb_set_intfdata(iface, data);
iface->needs_binding = 0;
@@ -619,6 +634,7 @@ static void usb_unbind_claim(struct usb_interface *iface)
usb_unbind_interface(dev);
dev_set_drvdata(dev, NULL);
dev->driver = NULL;
+ usb_put_claim_owner(iface);
}
/**
@@ -653,6 +669,7 @@ void usb_driver_release_interface(struct usb_driver *driver,
if (device_is_bound(dev)) {
device_unlock(dev);
device_release_driver(dev);
+ usb_put_claim_owner(iface);
return;
}
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index e56079398d26e..306978caaf1ef 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1845,6 +1845,7 @@ static void usb_release_interface(struct device *dev)
struct usb_interface_cache *intfc =
altsetting_to_usb_interface_cache(intf->altsetting);
+ usb_put_claim_owner(intf);
kref_put(&intfc->ref, usb_release_interface_cache);
usb_put_dev(interface_to_usbdev(intf));
of_node_put(dev->of_node);
@@ -2269,6 +2270,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
*/
for (i = 0; i < nintf; ++i) {
struct usb_interface *intf = cp->interface[i];
+ struct module *claim_owner;
if (intf->dev.of_node &&
!of_device_is_available(intf->dev.of_node)) {
@@ -2282,12 +2284,16 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
dev_name(&intf->dev), configuration,
intf->cur_altsetting->desc.bInterfaceNumber);
device_enable_async_suspend(&intf->dev);
+ device_lock(&intf->dev);
+ claim_owner = xchg(&intf->claim_owner, NULL);
+ device_unlock(&intf->dev);
ret = device_add(&intf->dev);
if (ret) {
device_lock(&intf->dev);
intf->unregistering = 1;
device_unlock(&intf->dev);
}
+ module_put(claim_owner);
if (ret != 0) {
dev_err(&dev->dev, "device_add(%s) --> %d\n",
dev_name(&intf->dev), ret);
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index a9b37aeb515be..dfa48f43046d4 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -49,6 +49,7 @@ extern int usb_set_isoch_delay(struct usb_device *dev);
extern int usb_get_bos_descriptor(struct usb_device *dev);
extern void usb_release_bos_descriptor(struct usb_device *dev);
extern int usb_set_configuration(struct usb_device *dev, int configuration);
+void usb_put_claim_owner(struct usb_interface *intf);
extern int usb_choose_configuration(struct usb_device *udev);
extern int usb_generic_driver_probe(struct usb_device *udev);
extern void usb_generic_driver_disconnect(struct usb_device *udev);
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 825f03b290670..a5e706f67f33a 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -213,6 +213,7 @@ enum usb_wireless_status {
* @dev: driver model's view of this device
* @usb_dev: if an interface is bound to the USB major, this will point
* to the sysfs representation for that device.
+ * @claim_owner: Module reference for an unpublished claim.
* @reset_ws: Used for scheduling resets from atomic context.
* @resetting_device: USB core reset the device, so use alt setting 0 as
* current; needs bandwidth alloc after reset.
@@ -271,6 +272,7 @@ struct usb_interface {
struct device dev; /* interface specific device info */
struct device *usb_dev;
+ struct module *claim_owner;
struct work_struct reset_ws; /* for resets in atomic context */
};
--
2.56.1