[PATCH v3 11/31] USB: Unwind interface claims after registration or binding failure

From: Leon Romanovsky

Date: Wed Nov 18 2026 - 14:29:57 EST


From: Leon Romanovsky <leonro@xxxxxxxxxx>

A successful USB-audio control probe can claim unregistered playback and
capture interfaces. If playback registration fails, releasing its claim
alone leaves the card active, its disconnect callback returns immediately.

usb_set_configuration()
device_add(control)
usb_audio_probe()
snd_usb_create_streams()
snd_usb_create_stream(playback)
usb_driver_claim_interface(playback)
snd_usb_create_stream(capture)
usb_driver_claim_interface(capture)
device_add(playback) [fails]

Configuration removal skips unregistered claims and binding failure can
also clear dev->driver without disconnecting the claimant.

Release the failed claim, remove the configuration if sibling claims
remain, and disconnect unpublished claims before freeing interfaces or
dropping the module reference.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Fixes: 86d30741e480f ("[PATCH] USB: Usbcore: Don't try to delete unregistered interfaces")
Fixes: c6a46696f97ff ("driver core: don't fail attaching the device if it cannot be bound")
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/usb/core/driver.c | 3 ++-
drivers/usb/core/message.c | 41 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 3beed56fabf3d..e2a120c64f6e1 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -488,7 +488,8 @@ static int usb_unbind_interface(struct device *dev)
/* Already in altsetting 0 so skip Set-Interface.
* Just re-enable it without affecting the endpoint toggles.
*/
- usb_enable_interface(udev, intf, false);
+ if (!intf->unregistering)
+ usb_enable_interface(udev, intf, false);
} else if (!error && !intf->dev.power.is_prepared) {
r = usb_set_interface(udev, intf->altsetting[0].
desc.bInterfaceNumber, 0);
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 306978caaf1ef..b2e5ed35a4a59 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1489,6 +1489,9 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
device_del(&interface->dev);
}

+ for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++)
+ usb_release_unregistered_interface(dev->actconfig->interface[i]);
+
/* Now that the interfaces are unbound, nobody should
* try to access them.
*/
@@ -2020,6 +2023,25 @@ int usb_set_wireless_status(struct usb_interface *iface,
}
EXPORT_SYMBOL_GPL(usb_set_wireless_status);

+static bool usb_has_claimant(struct usb_device *dev,
+ const struct device_driver *claimant)
+{
+ struct usb_host_config *config = dev->actconfig;
+ int i;
+
+ for (i = 0; i < config->desc.bNumInterfaces; i++) {
+ struct device *intf = &config->interface[i]->dev;
+ bool claimed;
+
+ device_lock(intf);
+ claimed = intf->driver == claimant;
+ device_unlock(intf);
+ if (claimed)
+ return true;
+ }
+ return false;
+}
+
/*
* usb_set_configuration - Makes a particular device setting be current
* @dev: the device whose configuration is being updated
@@ -2270,6 +2292,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 device_driver *claimant;
struct module *claim_owner;

if (intf->dev.of_node &&
@@ -2285,6 +2308,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
intf->cur_altsetting->desc.bInterfaceNumber);
device_enable_async_suspend(&intf->dev);
device_lock(&intf->dev);
+ claimant = intf->dev.driver;
claim_owner = xchg(&intf->claim_owner, NULL);
device_unlock(&intf->dev);
ret = device_add(&intf->dev);
@@ -2293,7 +2317,22 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
intf->unregistering = 1;
device_unlock(&intf->dev);
}
- module_put(claim_owner);
+ if (claimant && (ret || !intf->dev.driver) &&
+ usb_driver_release_refused_claim(intf, claimant)) {
+ bool unconfigure = usb_has_claimant(dev, claimant);
+
+ get_device(&intf->dev);
+ if (unconfigure)
+ usb_set_configuration(dev, -1);
+ module_put(claim_owner);
+ put_device(&intf->dev);
+ if (unconfigure) {
+ usb_autosuspend_device(dev);
+ return ret ? ret : -ENODEV;
+ }
+ } else {
+ module_put(claim_owner);
+ }
if (ret != 0) {
dev_err(&dev->dev, "device_add(%s) --> %d\n",
dev_name(&intf->dev), ret);

--
2.56.1