Unverified Commit 9ff44822 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6944 USB: core: Fix deadlock in usb_deauthorize_interface() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DI55M53JEVKHZDEFR7S3FE4HG5WG5F7Q/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L5GW 
 
Link:https://gitee.com/openeuler/kernel/pulls/6944

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 1e51a9c6 f79fa6ed

drivers/usb/core/sysfs.c

+13 −3
Original line number Diff line number Diff line
@@ -1069,14 +1069,24 @@ static ssize_t interface_authorized_store(struct device *dev, 
{

	struct usb_interface *intf = to_usb_interface(dev);

	bool val;

	struct kernfs_node *kn;



	if (strtobool(buf, &val) != 0)

		return -EINVAL;



	if (val)

	if (val) {

		usb_authorize_interface(intf);

	else

	} else {

		/*

		 * Prevent deadlock if another process is concurrently

		 * trying to unregister intf.

		 */

		kn = sysfs_break_active_protection(&dev->kobj, &attr->attr);

		if (kn) {

			usb_deauthorize_interface(intf);

			sysfs_unbreak_active_protection(kn);

		}

	}



	return count;

}