diff mbox series

[2/2] usb: roles: Take care of driver module reference counting

Message ID 20180919075805.61319-3-heikki.krogerus@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series mux handling fixes for usb-linus | expand

Commit Message

Heikki Krogerus Sept. 19, 2018, 7:58 a.m. UTC 
This fixes potential "BUG: unable to handle kernel paging
request at ..." from happening.

Fixes: fde0aa6c175a ("usb: common: Small class for USB role switches")
Cc: <stable@vger.kernel.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/common/roles.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

Sasha Levin Sept. 19, 2018, 6:58 p.m. UTC | #1 
Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v4.18.8, v4.14.70, v4.9.127, v4.4.156, v3.18.122, 

v4.18.8: Build OK!
v4.14.70: Failed to apply! Possible dependencies:
    fde0aa6c175a ("usb: common: Small class for USB role switches")

v4.9.127: Failed to apply! Possible dependencies:
    fde0aa6c175a ("usb: common: Small class for USB role switches")

v4.4.156: Failed to apply! Possible dependencies:
    fde0aa6c175a ("usb: common: Small class for USB role switches")

v3.18.122: Failed to apply! Possible dependencies:
    fde0aa6c175a ("usb: common: Small class for USB role switches")


Please let us know how to resolve this.

--
Thanks,
Sasha
diff mbox series

Patch

diff --git a/drivers/usb/common/roles.c b/drivers/usb/common/roles.c
index 15cc76e22123..99116af07f1d 100644
--- a/drivers/usb/common/roles.c
+++ b/drivers/usb/common/roles.c
@@ -109,8 +109,15 @@  static void *usb_role_switch_match(struct device_connection *con, int ep,
  */
 struct usb_role_switch *usb_role_switch_get(struct device *dev)
 {
-	return device_connection_find_match(dev, "usb-role-switch", NULL,
-					    usb_role_switch_match);
+	struct usb_role_switch *sw;
+
+	sw = device_connection_find_match(dev, "usb-role-switch", NULL,
+					  usb_role_switch_match);
+
+	if (!IS_ERR_OR_NULL(sw))
+		WARN_ON(!try_module_get(sw->dev.parent->driver->owner));
+
+	return sw;
 }
 EXPORT_SYMBOL_GPL(usb_role_switch_get);
 
@@ -122,8 +129,10 @@  EXPORT_SYMBOL_GPL(usb_role_switch_get);
  */
 void usb_role_switch_put(struct usb_role_switch *sw)
 {
-	if (!IS_ERR_OR_NULL(sw))
+	if (!IS_ERR_OR_NULL(sw)) {
 		put_device(&sw->dev);
+		module_put(sw->dev.parent->driver->owner);
+	}
 }
 EXPORT_SYMBOL_GPL(usb_role_switch_put);