Merge "USB: f_fs: Fix disconnect check during ongoing IO" (2c2eb6c2) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/usb/gadget/function/f_fs.c

+28 −6

Original line number	Diff line number	Diff line
		@@ -1084,19 +1084,40 @@ static ssize_t ffs_epfile_io(struct file file, struct ffs_io_data io_data)
		* status. usb_ep_dequeue API should guarantee no race
		* condition with req->complete callback.
		*/
		spin_lock_irq(&epfile->ffs->eps_lock);
		interrupted = true;
		/*
		* While we were acquiring lock endpoint got
		* disabled (disconnect) or changed
		(composition switch) ?
		*/
		if (epfile->ep == ep) {
		usb_ep_dequeue(ep->ep, req);
		interrupted = ep->status < 0;
		}
		spin_unlock_irq(&epfile->ffs->eps_lock);
		}

		ffs_log("ep status %d for req %pK", ep->status, req);

		if (interrupted)
		if (interrupted) {
		ret = -EINTR;
		else if (io_data->read && ep->status > 0)
		goto error_mutex;
		}

		ret = -ENODEV;
		spin_lock_irq(&epfile->ffs->eps_lock);
		/*
		* While we were acquiring lock endpoint got
		* disabled (disconnect) or changed
		* (composition switch) ?
		*/
		if (epfile->ep == ep)
		ret = ep->status;
		spin_unlock_irq(&epfile->ffs->eps_lock);
		if (io_data->read && ret > 0)
		ret = __ffs_epfile_read_data(epfile, data, ep->status,
		&io_data->data);
		else
		ret = ep->status;
		goto error_mutex;
		} else if (!(req = usb_ep_alloc_request(ep->ep, GFP_ATOMIC))) {
		ret = -ENOMEM;
		@@ -3753,6 +3774,7 @@ static void ffs_func_unbind(struct usb_configuration *c,
		if (ep->ep && ep->req)
		usb_ep_free_request(ep->ep, ep->req);
		ep->req = NULL;
		ep->ep = NULL;
		++ep;
		}
		spin_unlock_irqrestore(&func->ffs->eps_lock, flags);