UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: f_fs: check quirk to pad epout buf size when not aligned to maxpacketsize 

Check gadget.quirk_ep_out_aligned_size to decide if buffer size requires
to be aligned to maxpacketsize of an out endpoint.  ffs_epfile_io() needs
to pad epout buffer to match above condition if quirk is found.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Michal Nazarewicz 2013-12-09 15:55:37 -08:00 committed by Felipe Balbi
parent 7fa6803483
commit 219580e64f
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/gadget/f_fs.c
View File

@ -753,9 +753,10 @@ static ssize_t ffs_epfile_io(struct file *file,
char __user *buf, size_t len, int read) char __user *buf, size_t len, int read)
{ {
struct ffs_epfile *epfile = file->private_data; struct ffs_epfile *epfile = file->private_data;
struct usb_gadget *gadget = epfile->ffs->gadget;
struct ffs_ep *ep; struct ffs_ep *ep;
char *data = NULL; char *data = NULL;
ssize_t ret; ssize_t ret, data_len;
int halt; int halt;
/* Are we still active? */ /* Are we still active? */
@ -788,7 +789,13 @@ static ssize_t ffs_epfile_io(struct file *file,
/* Allocate & copy */ /* Allocate & copy */
if (!halt) { if (!halt) {
data = kmalloc(len, GFP_KERNEL); /*
* Controller may require buffer size to be aligned to
* maxpacketsize of an out endpoint.
*/
data_len = read ? usb_ep_align_maybe(gadget, ep->ep, len) : len;
data = kmalloc(data_len, GFP_KERNEL);
if (unlikely(!data)) if (unlikely(!data))
return -ENOMEM; return -ENOMEM;
@ -823,7 +830,7 @@ static ssize_t ffs_epfile_io(struct file *file,
req->context = &done; req->context = &done;
req->complete = ffs_epfile_io_complete; req->complete = ffs_epfile_io_complete;
req->buf = data; req->buf = data;
req->length = len; req->length = data_len;
ret = usb_ep_queue(ep->ep, req, GFP_ATOMIC); ret = usb_ep_queue(ep->ep, req, GFP_ATOMIC);
@ -835,9 +842,17 @@ static ssize_t ffs_epfile_io(struct file *file,
ret = -EINTR; ret = -EINTR;
usb_ep_dequeue(ep->ep, req); usb_ep_dequeue(ep->ep, req);
} else { } else {
/*
* XXX We may end up silently droping data here.
* Since data_len (i.e. req->length) may be bigger
* than len (after being rounded up to maxpacketsize),
* we may end up with more data then user space has
* space for.
*/
ret = ep->status; ret = ep->status;
if (read && ret > 0 && if (read && ret > 0 &&
unlikely(copy_to_user(buf, data, ret))) unlikely(copy_to_user(buf, data,
min_t(size_t, ret, len))))
ret = -EFAULT; ret = -EFAULT;
} }
} }