linux-kernel - Re: [PATCH 1/1]linux-usb: optimize to match the Huawei USB storage devices

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <Pine.LNX.4.44L0.1212111155220.1372-100000@iolanthe.rowland.org>
Date:	Tue, 11 Dec 2012 12:02:20 -0500 (EST)
From:	Alan Stern <stern@...land.harvard.edu>
To:	fangxiaozhi 00110321 <fangxiaozhi@...wei.com>
cc:	linux-usb@...r.kernel.org, <linux-kernel@...r.kernel.org>,
	<zihan@...wei.com>, <Lin.Lei@...wei.com>, <greg@...ah.com>,
	<neil.yi@...wei.com>, <wangyuhua@...wei.com>
Subject: Re: [PATCH 1/1]linux-usb: optimize to match the Huawei USB storage
 devices

On Tue, 11 Dec 2012, fangxiaozhi 00110321 wrote:

> From: fangxiaozhi <huananhu@...wei.com>
> 
> To optimize the match rules for the Huawei USB storage devices. Avoid to load USB storage driver for modem interface with Huawei devices.
> 
> Signed-off-by: fangxiaozhi <huananhu@...wei.com>
> 
> ---------------------------------------------------------------------------------
> diff -uprN linux-3.7_bak/drivers/usb/storage/initializers.c linux-3.7/drivers/usb/storage/initializers.c
> --- linux-3.7_bak/drivers/usb/storage/initializers.c	2012-12-11 09:56:11.000000000 +0800
> +++ linux-3.7/drivers/usb/storage/initializers.c	2012-12-11 15:33:24.000000000 +0800
> @@ -93,14 +93,20 @@ int usb_stor_ucr61s2b_init(struct us_dat
>  }
>  
>  /* This places the HUAWEI E220 devices in multi-port mode */
> -int usb_stor_huawei_e220_init(struct us_data *us)
> +int usb_stor_huawei_init(struct us_data *us)

If this routine is no longer meant for E220 devices, shouldn't the 
comment be changed?

>  {
>  	int result;
> +	struct usb_interface_descriptor *idesc = NULL;
>  
> -	result = usb_stor_control_msg(us, us->send_ctrl_pipe,
> -				      USB_REQ_SET_FEATURE,
> -				      USB_TYPE_STANDARD | USB_RECIP_DEVICE,
> -				      0x01, 0x0, NULL, 0x0, 1000);
> -	US_DEBUGP("Huawei mode set result is %d\n", result);
> +	idesc = &us->pusb_intf->cur_altsetting->desc;
> +	if (NULL != idesc ) {
> +		if ( (0x0000 == idesc->bInterfaceNumber)) {

You could write:

	if (idesc != NULL && idesc->bInterfaceNumber == 0) {

> +			result = usb_stor_control_msg(us, us->send_ctrl_pipe,
> +					USB_REQ_SET_FEATURE,
> +					USB_TYPE_STANDARD | USB_RECIP_DEVICE,
> +					0x01, 0x0, NULL, 0x0, 1000);
> +			US_DEBUGP("Huawei mode set result is %d\n", result);
> +		}
> +	}
>  	return 0;
>  }

> --- linux-3.7_bak/drivers/usb/storage/unusual_devs.h	2012-12-11 09:56:11.000000000 +0800
> +++ linux-3.7/drivers/usb/storage/unusual_devs.h	2012-12-11 15:34:29.000000000 +0800
> @@ -1527,335 +1527,335 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x
>  /* Reported by fangxiaozhi <huananhu@...wei.com>
>   * This brings the HUAWEI data card devices into multi-port mode
>   */
> -UNUSUAL_DEV(  0x12d1, 0x1001, 0x0000, 0x0000,
> +HW_UNUSUAL_DEV(  0x12d1, 0x1001, 0x08, 0x06, 0x50,

Where does the name "HW_UNUSUAL_DEV" come from?  You should use a 
better name, something that indicates what it is for.  And bear in mind 
that this new macro could be used for other devices, not just Huawei's.
Maybe something like UNUSUAL_DEV_INTF.

Alan Stern

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/