lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: gadget: rndis: don't test against req->length

Browse Source 
composite.c always sets req->length to zero
and expects function driver's setup handlers
to return the amount of bytes to be used
on req->length. If we test against req->length
w_length will always be greater than req->length
thus making us always stall that particular
SEND_ENCAPSULATED_COMMAND request.

Tested against a Windows XP SP3.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Felipe Balbi
2011-05-13 16:53:48 +03:00
committed by Greg Kroah-Hartman
parent bf1f0a05d4
commit 472b91274a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/gadget/f_rndis.c
View File

@@ -420,8 +420,7 @@ rndis_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
*/ */
case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
| USB_CDC_SEND_ENCAPSULATED_COMMAND: | USB_CDC_SEND_ENCAPSULATED_COMMAND:
if (w_length > req->length || w_value if (w_value || w_index != rndis->ctrl_id)
|| w_index != rndis->ctrl_id)
goto invalid; goto invalid;
/* read the request; process it later */ /* read the request; process it later */
value = w_length; value = w_length;