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

!9614 v2 wifi: carl9170: add a proper sanity check for endpoints 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 48f08645 a67c7193

drivers/net/wireless/ath/carl9170/usb.c

+32 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,38 @@ static int carl9170_usb_probe(struct usb_interface *intf, 
			ar->usb_ep_cmd_is_bulk = true;

	}



	/* Verify that all expected endpoints are present */

	if (ar->usb_ep_cmd_is_bulk) {

		u8 bulk_ep_addr[] = {

			AR9170_USB_EP_RX | USB_DIR_IN,

			AR9170_USB_EP_TX | USB_DIR_OUT,

			AR9170_USB_EP_CMD | USB_DIR_OUT,

			0};

		u8 int_ep_addr[] = {

			AR9170_USB_EP_IRQ | USB_DIR_IN,

			0};

		if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) ||

		    !usb_check_int_endpoints(intf, int_ep_addr))

			err = -ENODEV;

	} else {

		u8 bulk_ep_addr[] = {

			AR9170_USB_EP_RX | USB_DIR_IN,

			AR9170_USB_EP_TX | USB_DIR_OUT,

			0};

		u8 int_ep_addr[] = {

			AR9170_USB_EP_IRQ | USB_DIR_IN,

			AR9170_USB_EP_CMD | USB_DIR_OUT,

			0};

		if (!usb_check_bulk_endpoints(intf, bulk_ep_addr) ||

		    !usb_check_int_endpoints(intf, int_ep_addr))

			err = -ENODEV;

	}



	if (err) {

		carl9170_free(ar);

		return err;

	}



	usb_set_intfdata(intf, ar);

	SET_IEEE80211_DEV(ar->hw, &intf->dev);