raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

dcw_otg: trim xfer length when buffer larger than allocated size is received

Browse Source
This commit is contained in:
popcornmix
2016-02-12 14:50:25 +00:00
parent 8bff7d473f
commit 96e3407cf0
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
View File

@@ -737,6 +737,11 @@ static int update_urb_state_xfer_comp(dwc_hc_t * hc,
DWC_OTG_HC_XFER_COMPLETE, DWC_OTG_HC_XFER_COMPLETE,
&short_read); &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. */ /* non DWORD-aligned buffer case handling. */
if (hc->align_buff && xfer_length && hc->ep_is_in) { if (hc->align_buff && xfer_length && hc->ep_is_in) {
dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf, dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,
@@ -1423,6 +1428,12 @@ static void update_urb_state_xfer_intr(dwc_hc_t * hc,
{ {
uint32_t bytes_transferred = get_actual_xfer_length(hc, hc_regs, qtd, uint32_t bytes_transferred = get_actual_xfer_length(hc, hc_regs, qtd,
halt_status, NULL); 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. */ /* non DWORD-aligned buffer case handling. */
if (hc->align_buff && bytes_transferred && hc->ep_is_in) { if (hc->align_buff && bytes_transferred && hc->ep_is_in) {
dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf, dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,