malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "usb: gadget: f_mtp: Avoid race between mtp_read and mtp_function_disable"

Browse Source
This commit is contained in:
qctecmdr Service 2018-05-24 21:24:40 -07:00 committed by Gerrit - the friendly Code Review server
commit 7a6fc6392a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,7 +556,17 @@ static ssize_t mtp_read(struct file *fp, char __user *buf,
goto done;
}
spin_lock_irq(&dev->lock);
if (dev->state == STATE_OFFLINE) {
spin_unlock_irq(&dev->lock);
return -ENODEV;
}
if (dev->ep_out->desc) {
if (!cdev) {
spin_unlock_irq(&dev->lock);
return -ENODEV;
}
len = usb_ep_align_maybe(cdev->gadget, dev->ep_out, count);
if (len > MTP_BULK_BUFFER_SIZE) {
spin_unlock_irq(&dev->lock);
@ -1267,7 +1277,10 @@ mtp_function_unbind(struct usb_configuration *c, struct usb_function *f)
mtp_request_free(dev->rx_req[i], dev->ep_out);
while ((req = mtp_req_get(dev, &dev->intr_idle)))
mtp_request_free(req, dev->ep_intr);
spin_lock_irq(&dev->lock);
dev->state = STATE_OFFLINE;
dev->cdev = NULL;
spin_unlock_irq(&dev->lock);
kfree(f->os_desc_table);
f->os_desc_n = 0;
fi_mtp->func_inst.f = NULL;
@ -1323,7 +1336,9 @@ static void mtp_function_disable(struct usb_function *f)
struct usb_composite_dev *cdev = dev->cdev;
DBG(cdev, "mtp_function_disable\n");
spin_lock_irq(&dev->lock);
dev->state = STATE_OFFLINE;
spin_unlock_irq(&dev->lock);
usb_ep_disable(dev->ep_in);
usb_ep_disable(dev->ep_out);
usb_ep_disable(dev->ep_intr);