linux-kernel - RE: [PATCH] usb: cdnsp: Fixed setting last

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 9 Jun 2022 07:33:37 +0000
From:   Pawel Laszczak <pawell@...ence.com>
To:     "3090101217@....edu.cn" <3090101217@....edu.cn>,
        "gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>,
        "peter.chen@...nel.org" <peter.chen@...nel.org>
CC:     "linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Jing Leng <jleng@...arella.com>
Subject: RE: [PATCH] usb: cdnsp: Fixed setting last_trb incorrectly

>
>From: Jing Leng <jleng@...arella.com>
>
>When ZLP occurs in bulk transmission, currently cdnsp will set last_trb
>for the last two TRBs, it will trigger an error "ERROR Transfer event TRB
>DMA ptr not part of current TD ...".
>
>Fixes: e913aada0683 ("usb: cdnsp: Fixed issue with ZLP")
>Signed-off-by: Jing Leng <jleng@...arella.com>

Acked-by: Pawel Laszczak <pawell@...ence.com>

>---
> drivers/usb/cdns3/cdnsp-ring.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c
>index e45c3d6e1536..794e413800ae 100644
>--- a/drivers/usb/cdns3/cdnsp-ring.c
>+++ b/drivers/usb/cdns3/cdnsp-ring.c
>@@ -1941,13 +1941,16 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
> 		}
>
> 		if (enqd_len + trb_buff_len >= full_len) {
>-			if (need_zero_pkt)
>-				zero_len_trb = !zero_len_trb;
>-
>-			field &= ~TRB_CHAIN;
>-			field |= TRB_IOC;
>-			more_trbs_coming = false;
>-			preq->td.last_trb = ring->enqueue;
>+			if (need_zero_pkt && !zero_len_trb) {
>+				zero_len_trb = true;
>+			} else {
>+				zero_len_trb = false;
>+				field &= ~TRB_CHAIN;
>+				field |= TRB_IOC;
>+				more_trbs_coming = false;
>+				need_zero_pkt = false;
>+				preq->td.last_trb = ring->enqueue;
>+			}
> 		}
>
> 		/* Only set interrupt on short packet for OUT endpoints. */
>@@ -1962,7 +1965,7 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
> 		length_field = TRB_LEN(trb_buff_len) | TRB_TD_SIZE(remainder) |
> 			TRB_INTR_TARGET(0);
>
>-		cdnsp_queue_trb(pdev, ring, more_trbs_coming | zero_len_trb,
>+		cdnsp_queue_trb(pdev, ring, more_trbs_coming,
> 				lower_32_bits(send_addr),
> 				upper_32_bits(send_addr),
> 				length_field,
>--
>2.17.1