Commit 0d905fd5 authored by Dan Williams's avatar Dan Williams Committed by Greg Kroah-Hartman
Browse files

USB: option: convert Huawei K3765, K4505, K4605 reservered interface to blacklist 



That's what the blacklist is for...

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4626c10

drivers/usb/serial/option.c

+43 −36
Original line number Diff line number Diff line
@@ -495,6 +495,10 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = { 
	.sendsetup = BIT(0) | BIT(1) | BIT(2),

};



static const struct option_blacklist_info huawei_cdc12_blacklist = {

	.reserved = BIT(1) | BIT(2),

};



static const struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -592,12 +596,15 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
@@ -1207,10 +1214,35 @@ static void __exit option_exit(void) 
module_init(option_init);

module_exit(option_exit);



static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,

			   const struct option_blacklist_info *blacklist)

{

	unsigned long num;

	const unsigned long *intf_list;



	if (blacklist) {

		if (reason == OPTION_BLACKLIST_SENDSETUP)

			intf_list = &blacklist->sendsetup;

		else if (reason == OPTION_BLACKLIST_RESERVED_IF)

			intf_list = &blacklist->reserved;

		else {

			BUG_ON(reason);

			return false;

		}



		for_each_set_bit(num, intf_list, MAX_BL_NUM + 1) {

			if (num == ifnum)

				return true;

		}

	}

	return false;

}



static int option_probe(struct usb_serial *serial,

			const struct usb_device_id *id)

{

	struct usb_wwan_intf_private *data;



	/* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */

	if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&

		serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
@@ -1223,14 +1255,14 @@ static int option_probe(struct usb_serial *serial, 
		serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)

		return -ENODEV;



	/* Don't bind network interfaces on Huawei K3765, K4505 & K4605 */

	if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID &&

		(serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 ||

			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505 ||

			serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4605) &&

		(serial->interface->cur_altsetting->desc.bInterfaceNumber == 1 ||

			serial->interface->cur_altsetting->desc.bInterfaceNumber == 2))

		return -ENODEV;

	/* Don't bind reserved interfaces (like network ones) which often have

	 * the same class/subclass/protocol as the serial interfaces.  Look at

	 * the Windows driver .INF files for reserved interface numbers.

	 */

	if (is_blacklisted(

		serial->interface->cur_altsetting->desc.bInterfaceNumber,

		OPTION_BLACKLIST_RESERVED_IF,

		(const struct option_blacklist_info *) id->driver_info))



	/* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */

	if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID &&
@@ -1239,7 +1271,6 @@ static int option_probe(struct usb_serial *serial, 
		return -ENODEV;



	data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);



	if (!data)

		return -ENOMEM;

	data->send_setup = option_send_setup;
@@ -1248,30 +1279,6 @@ static int option_probe(struct usb_serial *serial, 
	return 0;

}



static bool is_blacklisted(const u8 ifnum, enum option_blacklist_reason reason,

			   const struct option_blacklist_info *blacklist)

{

	unsigned long num;

	const unsigned long *intf_list;



	if (blacklist) {

		if (reason == OPTION_BLACKLIST_SENDSETUP)

			intf_list = &blacklist->sendsetup;

		else if (reason == OPTION_BLACKLIST_RESERVED_IF)

			intf_list = &blacklist->reserved;

		else {

			BUG_ON(reason);

			return false;

		}



		for_each_set_bit(num, intf_list, MAX_BL_NUM + 1) {

			if (num == ifnum)

				return true;

		}

	}

	return false;

}



static void option_instat_callback(struct urb *urb)

{

	int err;