summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFabian Vogt <fabian@ritter-vogt.de>2021-03-24 17:11:14 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-26 16:43:47 +0300
commit3e7c2510bdfe89a9ec223dd7acd6bfc8bb1cbeb6 (patch)
treeea6d83e676064f4ed00ec24a9b7c8ab0c2415648 /drivers
parentfe8f103ab3e0eef5b6863da6f02b928af38e7c2d (diff)
downloadlinux-3e7c2510bdfe89a9ec223dd7acd6bfc8bb1cbeb6.tar.xz
fotg210-udc: Don't DMA more than the buffer can take
Before this, it wrote as much as available into the buffer, even if it didn't fit. Fixes: b84a8dee23fd ("usb: gadget: add Faraday fotg210_udc driver") Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de> Link: https://lore.kernel.org/r/20210324141115.9384-7-fabian@ritter-vogt.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/udc/fotg210-udc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index 38e24c199136..e4036a689adb 100644
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -338,8 +338,9 @@ static void fotg210_start_dma(struct fotg210_ep *ep,
} else {
buffer = req->req.buf + req->req.actual;
length = ioread32(ep->fotg210->reg +
- FOTG210_FIBCR(ep->epnum - 1));
- length &= FIBCR_BCFX;
+ FOTG210_FIBCR(ep->epnum - 1)) & FIBCR_BCFX;
+ if (length > req->req.length - req->req.actual)
+ length = req->req.length - req->req.actual;
}
} else {
buffer = req->req.buf + req->req.actual;