1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From 2407b0b1342fbe40d1c25a879590544405a07a11 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 12 Feb 2016 14:50:25 +0000
Subject: [PATCH] dcw_otg: trim xfer length when buffer larger than allocated
size is received
---
drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c | 11 +++++++++++
1 file changed, 11 insertions(+)
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
@@ -737,6 +737,11 @@ static int update_urb_state_xfer_comp(dw
DWC_OTG_HC_XFER_COMPLETE,
&short_read);
+ if (urb->actual_length + xfer_length > urb->length) {
+ DWC_WARN("%s(): trimming xfer length\n", __func__);
+ xfer_length = urb->length - urb->actual_length;
+ }
+
/* non DWORD-aligned buffer case handling. */
if (hc->align_buff && xfer_length && hc->ep_is_in) {
dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,
@@ -1423,6 +1428,12 @@ static void update_urb_state_xfer_intr(d
{
uint32_t bytes_transferred = get_actual_xfer_length(hc, hc_regs, qtd,
halt_status, NULL);
+
+ if (urb->actual_length + bytes_transferred > urb->length) {
+ DWC_WARN("%s(): trimming xfer length\n", __func__);
+ bytes_transferred = urb->length - urb->actual_length;
+ }
+
/* non DWORD-aligned buffer case handling. */
if (hc->align_buff && bytes_transferred && hc->ep_is_in) {
dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,
|
