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

!10642 usb: atm: cxacru: fix endpoint checking in cxacru_bind() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XFRCQS5TPVZCWSA2QX6GPAWP63PUHMT4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEOL 
 
Link:https://gitee.com/openeuler/kernel/pulls/10642

 

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 5d40a28f 3a378778

drivers/usb/atm/cxacru.c

+14 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
	struct cxacru_data *instance;

	struct usb_device *usb_dev = interface_to_usbdev(intf);

	struct usb_host_endpoint *cmd_ep = usb_dev->ep_in[CXACRU_EP_CMD];

	struct usb_endpoint_descriptor *in, *out;

	int ret;



	/* instance init */
@@ -1180,6 +1181,19 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance, 
		goto fail;

	}



	if (usb_endpoint_xfer_int(&cmd_ep->desc))

		ret = usb_find_common_endpoints(intf->cur_altsetting,

						NULL, NULL, &in, &out);

	else

		ret = usb_find_common_endpoints(intf->cur_altsetting,

						&in, &out, NULL, NULL);



	if (ret) {

		usb_err(usbatm_instance, "cxacru_bind: interface has incorrect endpoints\n");

		ret = -ENODEV;

		goto fail;

	}



	if ((cmd_ep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

			== USB_ENDPOINT_XFER_INT) {

		usb_fill_int_urb(instance->rcv_urb,