Skip to content

Commit

Permalink
usb: roles: Take care of driver module reference counting
Browse files Browse the repository at this point in the history
commit 5c54fca upstream.

This fixes potential "BUG: unable to handle kernel paging
request at ..." from happening.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Heikki Krogerus authored and gregkh committed Oct 3, 2018
1 parent 95b273c commit 7b169e3
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/usb/common/roles.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down

0 comments on commit 7b169e3

Please sign in to comment.