[PATCH v3 07/31] USB: Reject claims after interface registration failure
From: Leon Romanovsky
Date: Wed Nov 18 2026 - 14:29:30 EST
From: Leon Romanovsky <leonro@xxxxxxxxxx>
After device_add() fails, the interface remains in the active
configuration, so usbfs can still claim it. Configuration removal skips
unregistered interfaces and never calls the claimant's disconnect
callback.
A driver can claim an interface before USB core registers it. If
registration fails, reject further claims because USB core will not retry
registration of that object. Changing the device configuration creates
new interface objects.
Fixes: 86d30741e480 ("[PATCH] USB: Usbcore: Don't try to delete unregistered interfaces")
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/usb/core/driver.c | 2 +-
drivers/usb/core/message.c | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 926f63cd2c834..0a6fdf2e88f4e 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -561,7 +561,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,
device_lock(dev);
- if (!iface->authorized ||
+ if (!iface->authorized || iface->unregistering ||
(dev->of_node && !of_device_is_available(dev->of_node))) {
retval = -ENODEV;
goto unlock;
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index a738d03c23eac..e56079398d26e 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1468,8 +1468,13 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
* bandwidth_mutex, we have to mark all the interfaces
* before unregistering any of them.
*/
- for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++)
- dev->actconfig->interface[i]->unregistering = 1;
+ for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) {
+ struct usb_interface *intf = dev->actconfig->interface[i];
+
+ device_lock(&intf->dev);
+ intf->unregistering = 1;
+ device_unlock(&intf->dev);
+ }
for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) {
struct usb_interface *interface;
@@ -2278,6 +2283,11 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
intf->cur_altsetting->desc.bInterfaceNumber);
device_enable_async_suspend(&intf->dev);
ret = device_add(&intf->dev);
+ if (ret) {
+ device_lock(&intf->dev);
+ intf->unregistering = 1;
+ device_unlock(&intf->dev);
+ }
if (ret != 0) {
dev_err(&dev->dev, "device_add(%s) --> %d\n",
dev_name(&intf->dev), ret);
--
2.56.1