From: Keisuke Tsukuda <tkdkei@outlook.jp>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Sven Peter <sven@kernel.org>, Janne Grunau <j@jannau.net>,
Neal Gompa <neal@gompa.dev>,
Thinh Nguyen <Thinh.Nguyen@synopsys.com>,
"asahi@lists.linux.dev" <asahi@lists.linux.dev>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 2/2] usb: roles: wait for callbacks on unregister
Date: Tue, 17 Nov 2026 13:00:20 +0000 [thread overview]
Message-ID: <20261117125825.27629-3-tkdkei@outlook.jp> (raw)
In-Reply-To: <20261117125825.27629-1-tkdkei@outlook.jp>
usb_role_switch_set_role() and usb_role_switch_get_role() check the
registered flag before taking the switch lock. If a provider is
unregistered during a role request, unregister can return while its
callback is still running. The provider may then free memory used by
the callback, causing a use-after-free. A caller that passed the check
can also enter a callback after unregister returns.
Move the registered checks under the switch lock and clear the flag while
holding the same lock on unregister. This waits for active callbacks and
rejects callers that acquire the lock after the flag is cleared. The
preceding Apple DWC3 change avoids a lock inversion in its remove path.
Fixes: fde0aa6c175a ("usb: common: Small class for USB role switches")
Cc: stable@vger.kernel.org
Signed-off-by: Keisuke Tsukuda <tkdkei@outlook.jp>
---
drivers/usb/roles/class.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
--- a/drivers/usb/roles/class.c
+++ b/drivers/usb/roles/class.c
@@ -79,10 +79,11 @@
if (IS_ERR_OR_NULL(sw))
return 0;
- if (!sw->registered)
- return -EOPNOTSUPP;
-
mutex_lock(&sw->lock);
+ if (!sw->registered) {
+ ret = -EOPNOTSUPP;
+ goto unlock;
+ }
ret = sw->set(sw, role);
if (!ret) {
@@ -90,6 +91,7 @@
kobject_uevent(&sw->dev.kobj, KOBJ_CHANGE);
}
+unlock:
mutex_unlock(&sw->lock);
return ret;
@@ -107,16 +109,21 @@
{
enum usb_role role;
- if (IS_ERR_OR_NULL(sw) || !sw->registered)
+ if (IS_ERR_OR_NULL(sw))
return USB_ROLE_NONE;
mutex_lock(&sw->lock);
+ if (!sw->registered) {
+ role = USB_ROLE_NONE;
+ goto unlock;
+ }
if (sw->get)
role = sw->get(sw);
else
role = sw->role;
+unlock:
mutex_unlock(&sw->lock);
return role;
@@ -423,7 +430,10 @@
{
if (IS_ERR_OR_NULL(sw))
return;
+ /* Wait for in-flight set/get callbacks before unregistering. */
+ mutex_lock(&sw->lock);
sw->registered = false;
+ mutex_unlock(&sw->lock);
if (dev_fwnode(&sw->dev))
component_del(&sw->dev, &connector_ops);
device_unregister(&sw->dev);
next prev parent reply other threads:[~2026-11-17 13:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 12:59 [PATCH v2 0/2] usb: roles: wait for callbacks during unregister Keisuke Tsukuda
2026-11-17 13:00 ` [PATCH v2 1/2] usb: dwc3: apple: unregister role switch before taking lock Keisuke Tsukuda
2026-11-17 13:00 ` Keisuke Tsukuda [this message]
2026-11-20 13:23 ` [PATCH v2 2/2] usb: roles: wait for callbacks on unregister Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117125825.27629-3-tkdkei@outlook.jp \
--to=tkdkei@outlook.jp \
--cc=Thinh.Nguyen@synopsys.com \
--cc=asahi@lists.linux.dev \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=j@jannau.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neal@gompa.dev \
--cc=sven@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®