frodovdr/satip-axe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: fix USB bug (serial readers)

Browse Source
This commit is contained in:
Jaroslav Kysela 2015-08-03 18:53:41 +02:00
parent c48033761a
commit 5f8140d65f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/drivers/usb/core/message.c
View File

@ -134,12 +134,23 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
__u16 size, int timeout) __u16 size, int timeout)
{ {
struct usb_ctrlrequest *dr; struct usb_ctrlrequest *dr;
__u8 *data2;
int ret; int ret;
dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO); dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO);
if (!dr) if (!dr)
return -ENOMEM; return -ENOMEM;
data2 = kmalloc(max(size, 2), GFP_KERNEL);
if (data2 == NULL) {
kfree(dr);
return -ENOMEM;
}
if (data == NULL)
size = 0;
data2[0] = data2[1] = 0;
memcpy(data2, data, size);
dr->bRequestType = requesttype; dr->bRequestType = requesttype;
dr->bRequest = request; dr->bRequest = request;
dr->wValue = cpu_to_le16(value); dr->wValue = cpu_to_le16(value);
@ -148,8 +159,10 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
/* dbg("usb_control_msg"); */ /* dbg("usb_control_msg"); */
ret = usb_internal_control_msg(dev, pipe, dr, data, size, timeout); ret = usb_internal_control_msg(dev, pipe, dr, data2, size, timeout);
memcpy(data, data2, size);
kfree(data2);
kfree(dr); kfree(dr);
return ret; return ret;