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

!15345 USB: hub: Ignore non-compliant devices with too many configs or interfaces 

Merge Pull Request from: @ci-robot 
 
PR sync from: Bowen You <youbowen2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/UXP73MKFAF7OV3HCTO6NS5T3VTEVSPCL/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBPC7J 
 
Link:https://gitee.com/openeuler/kernel/pulls/15345

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 676ce157 04fb5746

drivers/usb/core/hub.c

+11 −0
Original line number Diff line number Diff line
@@ -1818,6 +1818,17 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	desc = intf->cur_altsetting;

	hdev = interface_to_usbdev(intf);



	/*

	 * The USB 2.0 spec prohibits hubs from having more than one

	 * configuration or interface, and we rely on this prohibition.

	 * Refuse to accept a device that violates it.

	 */

	if (hdev->descriptor.bNumConfigurations > 1 ||

			hdev->actconfig->desc.bNumInterfaces > 1) {

		dev_err(&intf->dev, "Invalid hub with more than one config or interface\n");

		return -EINVAL;

	}



	/*

	 * Set default autosuspend delay as 0 to speedup bus suspend,

	 * based on the below considerations: