shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: USB gadget: mtp: Fix hang in ioctl(MTP_RECEIVE_FILE) for WritePartialObject

Browse Source 
user space will hang at ioctl when copy file.
ioctl(mFD, MTP_RECEIVE_FILE, (unsigned long)&mfr);
length of read_req need rounded up to max packet size for usb_ep_queue,
Otherwise the read request will never complete.

Change-Id: Id8c6d7c44d1c16bb81dd77d3acc96ef2ab31f4c2
Signed-off-by: Mike Lockwood <lockwood@google.com>
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>
This commit is contained in:
zhang sanshan
2017-09-17 12:00:55 +08:00
committed by Jerry Zhang
parent 9452b2c248
commit 70b8b076f7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/function/f_mtp.c
View File

@@ -825,7 +825,7 @@ static void receive_file_work(struct work_struct *data)
struct usb_request *read_req = NULL, *write_req = NULL;
struct file *filp;
loff_t offset;
int64_t count;
int64_t count, len;
int ret, cur_buf = 0;
int r = 0;
@@ -843,8 +843,10 @@ static void receive_file_work(struct work_struct *data)
read_req = dev->rx_req[cur_buf];
cur_buf = (cur_buf + 1) % RX_REQ_MAX;
read_req->length = (count > MTP_BULK_BUFFER_SIZE
? MTP_BULK_BUFFER_SIZE : count);
len = usb_ep_align_maybe(cdev->gadget, dev->ep_out, count);
if (len > MTP_BULK_BUFFER_SIZE)
len = MTP_BULK_BUFFER_SIZE;
read_req->length = len;
dev->rx_done = 0;
ret = usb_ep_queue(dev->ep_out, read_req, GFP_KERNEL);
if (ret < 0) {