Commit d4a3e8bb authored by Xu Yang's avatar Xu Yang Committed by sanglipeng1
Browse files

usb: roles: don't get/set_role() when usb_role_switch is unregistered 

stable inclusion
from stable-v5.10.211
commit eb3693454baab7d784d3b56c96a99c106e49ce14
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=eb3693454baab7d784d3b56c96a99c106e49ce14



--------------------------------

commit b787a3e781759026a6212736ef8e52cf83d1821a upstream.

There is a possibility that usb_role_switch device is unregistered before
the user put usb_role_switch. In this case, the user may still want to
get/set_role() since the user can't sense the changes of usb_role_switch.

This will add a flag to show if usb_role_switch is already registered and
avoid unwanted behaviors.

Fixes: fde0aa6c ("usb: common: Small class for USB role switches")
cc: stable@vger.kernel.org
Signed-off-by: default avatarXu Yang <xu.yang_2@nxp.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240129093739.2371530-2-xu.yang_2@nxp.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent f5a5e320

drivers/usb/roles/class.c

+10 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ struct usb_role_switch { 
	struct mutex lock; /* device lock*/

	struct module *module; /* the module this device depends on */

	enum usb_role role;

	bool registered;



	/* From descriptor */

	struct device *usb2_port;
@@ -47,6 +48,9 @@ int usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role) 
	if (IS_ERR_OR_NULL(sw))

		return 0;



	if (!sw->registered)

		return -EOPNOTSUPP;



	mutex_lock(&sw->lock);



	ret = sw->set(sw, role);
@@ -72,7 +76,7 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) 
{

	enum usb_role role;



	if (IS_ERR_OR_NULL(sw))

	if (IS_ERR_OR_NULL(sw) || !sw->registered)

		return USB_ROLE_NONE;



	mutex_lock(&sw->lock);
@@ -347,6 +351,8 @@ usb_role_switch_register(struct device *parent, 
		return ERR_PTR(ret);

	}



	sw->registered = true;



	/* TODO: Symlinks for the host port and the device controller. */



	return sw;
@@ -361,9 +367,11 @@ EXPORT_SYMBOL_GPL(usb_role_switch_register); 
 */

void usb_role_switch_unregister(struct usb_role_switch *sw)

{

	if (!IS_ERR_OR_NULL(sw))

	if (!IS_ERR_OR_NULL(sw)) {

		sw->registered = false;

		device_unregister(&sw->dev);

	}

}

EXPORT_SYMBOL_GPL(usb_role_switch_unregister);



/**