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

!10616 USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QNYMHBCD3YAUDAKN5O56SBMHJP4YQW5Y/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEN0 
 
Link:https://gitee.com/openeuler/kernel/pulls/10616

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents c63e9a65 af318811

drivers/usb/core/config.c

+15 −3
Original line number Diff line number Diff line
@@ -291,6 +291,20 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, 
	if (ifp->desc.bNumEndpoints >= num_ep)

		goto skip_to_next_endpoint_or_interface_descriptor;



	/* Save a copy of the descriptor and use it instead of the original */

	endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];

	memcpy(&endpoint->desc, d, n);

	d = &endpoint->desc;



	/* Clear the reserved bits in bEndpointAddress */

	i = d->bEndpointAddress &

			(USB_ENDPOINT_DIR_MASK | USB_ENDPOINT_NUMBER_MASK);

	if (i != d->bEndpointAddress) {

		dev_notice(ddev, "config %d interface %d altsetting %d has an endpoint descriptor with address 0x%X, changing to 0x%X\n",

		    cfgno, inum, asnum, d->bEndpointAddress, i);

		endpoint->desc.bEndpointAddress = i;

	}



	/* Check for duplicate endpoint addresses */

	if (config_endpoint_is_duplicate(config, inum, asnum, d)) {

		dev_notice(ddev, "config %d interface %d altsetting %d has a duplicate endpoint with address 0x%X, skipping\n",
@@ -308,10 +322,8 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, 
		}

	}



	endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints];

	/* Accept this endpoint */

	++ifp->desc.bNumEndpoints;



	memcpy(&endpoint->desc, d, n);

	INIT_LIST_HEAD(&endpoint->urb_list);



	/*